Remove hard-coded path to pwd in Makefiles.

* Makefile.in:
* lib-src/Makefile.in:
* nextstep/Makefile.in:
* nt/Makefile.in: Replace hard-coded calls to /bin/pwd by calls
to 'pwd -P'.  Fixes bug#58080.

diff --git a/Makefile.in b/Makefile.in
index c6a2e509599f87b4c10da8c95094f257b07fd52f..741a4c5538ac06f7453d2990e55b52708853c131 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -698,8 +698,8 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
          [ -d $${dir} ] || exit 1 ; \
          dest="$$1" ; shift ; \
          if [ -d "$${dest}" ]; then \
-           exp_dest=`cd "$${dest}" && /bin/pwd`; \
-           [ "$$exp_dest" = "`cd $${dir} && /bin/pwd`" ] && continue ; \
+           exp_dest=`cd "$${dest}" && pwd -P`; \
+           [ "$$exp_dest" = "`cd $${dir} && pwd -P`" ] && continue ; \
          else true; \
          fi; \
          rm -rf "$${dest}" ; \
@@ -755,8 +755,8 @@ install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
 install-etcdoc: src install-arch-indep
        -unset CDPATH; \
        umask 022; ${MKDIR_P} "$(DESTDIR)${etcdocdir}" ; \
-       exp_etcdocdir=`cd "$(DESTDIR)${etcdocdir}"; /bin/pwd`; \
-       if [ "`cd ./etc; /bin/pwd`" != "$$exp_etcdocdir" ]; \
+       exp_etcdocdir=`cd "$(DESTDIR)${etcdocdir}"; pwd -P`; \
+       if [ "`cd ./etc; pwd -P`" != "$$exp_etcdocdir" ]; \
        then \
           docfile="DOC"; \
           printf 'Copying %s to %s ...\n' "etc/$$docfile" \
@@ -771,9 +771,9 @@ install-etcdoc: src install-arch-indep
 install-info: info
        umask 022; ${MKDIR_P} "$(DESTDIR)${infodir}"
        -unset CDPATH; \
-       thisdir=`/bin/pwd`; \
-       exp_infodir=`cd "$(DESTDIR)${infodir}" && /bin/pwd`; \
-       if [ "`cd ${srcdir}/info && /bin/pwd`" = "$$exp_infodir" ]; then \
+       thisdir=`pwd -P`; \
+       exp_infodir=`cd "$(DESTDIR)${infodir}" && pwd -P`; \
+       if [ "`cd ${srcdir}/info && pwd -P`" = "$$exp_infodir" ]; then \
          true; \
        else \
           [ -f "$(DESTDIR)${infodir}/dir" ] || \
@@ -802,7 +802,7 @@ install-info: info
 ## but not sure if portable.
 install-man:
        umask 022; ${MKDIR_P} "$(DESTDIR)${man1dir}"
-       thisdir=`/bin/pwd`; \
+       thisdir=`pwd -P`; \
        cd ${mansrcdir}; \
        for page in *.1; do \
          test "$$page" = ChangeLog.1 && continue; \
@@ -869,7 +869,7 @@ install-etc:
          ${srcdir}/etc/emacs.service > $${tmp}; \
        $(INSTALL_DATA) $${tmp} "$(DESTDIR)$(systemdunitdir)/${EMACS_NAME}.service"; \
        rm -f $${tmp}
-       thisdir=`/bin/pwd`; \
+       thisdir=`pwd -P`; \
        cd ${iconsrcdir} || exit 1; umask 022 ; \
        for dir in */*/apps */*/mimetypes; do \
          [ -d $${dir} ] || continue ; \
@@ -906,8 +906,8 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas
        -unset CDPATH; \
        for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" "$(ELN_DESTDIR)" ; do   \
          if [ -d "$${dir}" ]; then                     \
-           case `cd "$${dir}" ; /bin/pwd` in           \
-             "`cd ${srcdir} ; /bin/pwd`"* ) ;;         \
+           case `cd "$${dir}" ; pwd -P` in             \
+             "`cd ${srcdir} ; pwd -P`"* ) ;;           \
              * ) rm -rf "$${dir}" ;;                   \
            esac ;                                      \
            case "$${dir}" in                           \
@@ -918,7 +918,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc uninstall-gsettings-schemas
          fi ;                                          \
        done
        -rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
-       thisdir=`/bin/pwd`; \
+       thisdir=`pwd -P`; \
        (info_misc=`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
         if cd "$(DESTDIR)${infodir}"; then \
           for elt in ${INFO_NONMISC} $${info_misc}; do \

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index cf4659fc2c1c7e8ac601e22f966a2bfe0c12b43b..cfad3fc39418ee827878ab6917f2f70443e41385 100644 (file)
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -306,8 +306,8 @@ $(DESTDIR)${archlibdir}: all
        $(info $ )
        $(info Installing utilities run internally by Emacs.)
        umask 022 && ${MKDIR_P} "$(DESTDIR)${archlibdir}"
-       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd` && \
-       if [ "$$exp_archlibdir" != "`/bin/pwd`" ]; then \
+       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && pwd -P` && \
+       if [ "$$exp_archlibdir" != "`pwd -P`" ]; then \
          for file in ${UTILITIES}; do \
            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file \
              "$(DESTDIR)${archlibdir}/$$file" || exit; \
@@ -333,8 +333,8 @@ $(DESTDIR)${archlibdir}: all
         chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"
     endif
   endif
-       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd` && \
-       if [ "$$exp_archlibdir" != "`cd ${srcdir} && /bin/pwd`" ]; then \
+       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && pwd -P` && \
+       if [ "$$exp_archlibdir" != "`cd ${srcdir} && pwd -P`" ]; then \
          for file in ${SCRIPTS}; do \
            $(INSTALL_SCRIPT) ${srcdir}/$$file \
              "$(DESTDIR)${archlibdir}/$$file" || exit; \

diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 82bf13bc929dbcdf912aa5b679f27ae89158e4b8..c1200f73fbd37745fd12fb4fbf40a8654805cbf7 100644 (file)
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -59,7 +59,7 @@ ${ns_appdir}: ${srcdir}/${ns_appsrc} ${ns_appsrc}
        ${MKDIR_P} ${ns_appdir}
        ( cd ${srcdir}/${ns_appsrc} ; tar cfh - . ) | \
          ( cd ${ns_appdir} ; umask 022; tar xf - )
-       [ "`cd ${srcdir} && /bin/pwd`" = "`/bin/pwd`" ] || \
+       [ "`cd ${srcdir} && pwd -P`" = "`pwd -P`" ] || \
          ( cd ${ns_appsrc} ; tar cfh - . ) | \
            ( cd ${ns_appdir} ; umask 022; tar xf - )
        touch ${ns_appdir}

diff --git a/nt/Makefile.in b/nt/Makefile.in
index c904e6d451e4e48a514fb8a89ff45c5059e65f3d..c5a9bf4363d5310b806d29a72df6b063335d3383 100644 (file)
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -163,8 +163,8 @@ $(DESTDIR)${archlibdir}: all
        @echo
        @echo "Installing utilities run internally by Emacs."
        umask 022; ${MKDIR_P} "$(DESTDIR)${archlibdir}"
-       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
-       if [ "$$exp_archlibdir" != "`/bin/pwd`" ]; then \
+       exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && pwd -P`; \
+       if [ "$$exp_archlibdir" != "`pwd -P`" ]; then \
          for file in ${UTILITIES}; do \
            $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file "$(DESTDIR)${archlibdir}/$$file" ; \
          done ; \