* Makefile.in (mkdir, clean, mostlyclean, do-install): Use `(cd

	foo && pwd)` instead of `(cd foo ; pwd)` to get the canonical name
	of a directory; cd might fail, and have pwd print out the current
	directory.

1 files changed, 4 insertions, 4 deletions

diff --git a/Makefile.in b/Makefile.in
index 4639eacc54f..2d650e8a958 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -325,7 +325,7 @@ do-install: mkdir
 	    archlibdir=${archlibdir})
 	-set ${COPYDESTS} ; \
 	 for dir in ${COPYDIR} ; do \
-	   if [ `(cd $$1 ; pwd)` != `(cd $${dir} ; pwd)` ] ; then \
+	   if [ `(cd $$1 && pwd)` != `(cd $${dir} && pwd)` ] ; then \
 	     rm -rf $$1 ; \
 	   fi ; \
 	   shift ; \
@@ -335,7 +335,7 @@ do-install: mkdir
 	 for dir in ${COPYDIR} ; do \
 	   dest=$$1 ; shift ; \
 	   [ -d $${dir} ] \
-	   && [ `(cd $${dir}; /bin/pwd)` != `(cd $${dest}; /bin/pwd)` ] \
+	   && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
 	   && (echo "Copying $${dir}..." ; \
 	       (cd $${dir}; tar cf - . )|(cd $${dest}; umask 0; tar xvf - ); \
 	       for subdir in `find $${dest} -type d ! -name RCS -print` ; do \
@@ -345,7 +345,7 @@ do-install: mkdir
 		 rm -f  $${subdir}/*~ ; \
 	       done) ; \
 	 done
-	-[ `(cd ${srcdir}/info; /bin/pwd)` != `(cd ${infodir}; /bin/pwd)` ] \
+	-[ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ] \
 	 && (cd ${srcdir}/info ; \
 	     if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
 	       ${INSTALL_DATA} dir ${infodir}/dir ; \
@@ -394,7 +394,7 @@ clean mostlyclean:
 	cd src; $(MAKE) clean
 	cd lib-src; $(MAKE) clean
 	cd oldXMenu; $(MAKE) clean
-	if [ `(cd ${etcdir} ; /bin/pwd)` != `(cd etc; /bin/pwd)` ] ; then \
+	if [ `(cd ${etcdir} && /bin/pwd)` != `(cd etc && /bin/pwd)` ] ; then \
 	  cd etc; $(MAKE) clean; \
 	else true; \
 	fi