From acfb884cec67140e122bcfdf8ff0cc44dde707b6 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Tue, 1 Jun 1993 22:49:36 +0000 Subject: [PATCH] (do-install): Correct previous etc-copying change. (src/Makefile): Insert --x-libraries option into LD_SWITCH_X_SITE. --- Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 071a99e4f6a..b9890fb5c93 100644 --- a/Makefile.in +++ b/Makefile.in @@ -278,6 +278,7 @@ src/Makefile: ${srcdir}/src/Makefile.in Makefile -e 's|^CC *=.*$$|CC='"${CC}"'|' \ -e 's|^LN_S *=.*$$|LN_S='"${LN_S}"'|' \ -e 's|^CFLAGS *=.*$$|CFLAGS='"${CFLAGS}"'|' \ + -e 's|^\(LD_SWITCH_X_SITE *=\).*$$|\1'"${LD_SWITCH_X_SITE}"'|' \ -e '/^# DIST: /d') > src/Makefile.tmp @${srcdir}/move-if-change src/Makefile.tmp src/Makefile chmod -w src/Makefile @@ -348,9 +349,9 @@ do-install: mkdir rm -f $${subdir}/*~ ; \ done) ; \ done - [ `(cd etc; /bin/pwd)` != `(cd ${srcdir}/etc; /bin/pwd)` ] \ - && (echo "Copying etc/DOC* ..." ; \ - (cd etc; tar -cf - DOC*)|(cd ${etcdir}; umask 0; tar -xvf - )) + -[ `(cd ./etc; /bin/pwd)` != `(cd ${srcdir}etc; /bin/pwd)` ] \ + && (echo "Copying etc/DOC* ..." ; \ + (cd etc; tar -cf - DOC*)|(cd ${etcdir}; umask 0; tar -xvf - )) -[ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ] \ && (cd ${srcdir}/info ; \ if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \