Ignore exit status of `unset CDPATH' everywhwere.

On FreeBSD, the exiit status is 1 if CDPATH is not set.

diff --git a/ChangeLog b/ChangeLog
index 0bcbe0efbb86d0a10cfbd191e06cd11f7336ddca..224c9e264e58f7dce876b734a3b695cb3ddd7e98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-25  Gerd Moellmann  <gerd@gnu.org>
+
+       * Makefile.in: Ignore exit status of `unset CDPATH' everywhere.
+       On FreeBSD, the exit status is 1 if CDPATH is not set.
+
 2000-05-20  NIIBE Yutaka  <gniibe@mri.co.jp>
 
        * configure.in: Check for grandpt and getpt.

diff --git a/Makefile.in b/Makefile.in
index cf60eecd2cf16681dcad3a8b6452f9666e8ad99e..df3ae4b746fc3c5b2fe9cd288a8ee15fc0e6832c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -305,7 +305,7 @@ install-arch-dep: mkdir
        -chmod 1755  ${bindir}/emacs-${version}
        rm -f ${bindir}/$(EMACS)
        -ln ${bindir}/emacs-${version} ${bindir}/$(EMACS)
-       unset CDPATH; \
+       -unset CDPATH; \
        for f in `cd lib-src && echo fns-*.el`; do \
          ${INSTALL_DATA} lib-src/$$f ${archlibdir}/$$f; \
        done
@@ -319,7 +319,7 @@ install-arch-dep: mkdir
 ## as a workaround for a bug in tar on Ultrix 4.2.
 install-arch-indep: mkdir info
        -set ${COPYDESTS} ; \
-       unset CDPATH; \
+       -unset CDPATH; \
        for dir in ${COPYDIR} ; do \
          if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \
            rm -rf $$1 ; \
@@ -329,7 +329,7 @@ install-arch-indep: mkdir info
        -set ${COPYDESTS} ; \
        mkdir ${COPYDESTS} ; \
        chmod ugo+rx ${COPYDESTS} ; \
-       unset CDPATH; \
+       -unset CDPATH; \
        for dir in ${COPYDIR} ; do \
          dest=$$1 ; shift ; \
          [ -d $${dir} ] \
@@ -368,7 +368,7 @@ install-arch-indep: mkdir info
            > ${datadir}/emacs/site-lisp/subdirs.el; \
        fi
        -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
-       unset CDPATH; \
+       -unset CDPATH; \
        if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
        then \
           echo "Copying etc/DOC-* to ${docdir} ..." ; \
@@ -376,7 +376,7 @@ install-arch-indep: mkdir info
             |(cd ${docdir}; umask 0; tar -xvf - && cat > /dev/null); \
           (cd $(docdir); chmod a+r DOC*; rm DOC); \
        else true; fi
-       unset CDPATH; \
+       -unset CDPATH; \
        if [ -r ./lisp ] \
           && [ -r ./lisp/simple.el ] \
           && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
@@ -386,7 +386,7 @@ install-arch-indep: mkdir info
           (cd lisp; tar -cf - *.el *.elc) \
             |(cd ${lispdir}; umask 0; tar -xvf - && cat > /dev/null); \
        else true; fi
-       unset CDPATH; \
+       -unset CDPATH; \
        thisdir=`/bin/pwd`; \
        if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
        then \
@@ -458,7 +458,7 @@ uninstall:
         $(MAKE) $(MFLAGS) uninstall                    \
            prefix=${prefix} exec_prefix=${exec_prefix} \
            bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir})
-       unset CDPATH; \
+       -unset CDPATH; \
        for dir in ${lispdir} ${etcdir} ; do            \
          if [ -d $${dir} ]; then                       \
            case `(cd $${dir} ; /bin/pwd)` in           \