# HG changeset patch # User Jim Blandy # Date 738790729 0 # Node ID 2807618b3f72b192b3f58065b1650392fa9d4dce # Parent f00054d407531d5fbdc8e615f74fbbd9897e5ec5 * 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. diff -r f00054d40753 -r 2807618b3f72 Makefile.in --- a/Makefile.in Sun May 30 19:26:11 1993 +0000 +++ b/Makefile.in Sun May 30 19:38:49 1993 +0000 @@ -325,7 +325,7 @@ 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 @@ 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 @@ 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 @@ 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