diff options
| author | Richard M. Stallman <rms@gnu.org> | 1993-06-01 22:49:36 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1993-06-01 22:49:36 +0000 |
| commit | 02119f8370f4809df202e58bcbc0d568541cd7f3 (patch) | |
| tree | 04a88ac3968f0cc74a0faf8e9a19cd8da4ce2322 /Makefile.in | |
| parent | 1d15fc927324032f2bedaff718fb8428e6c893f7 (diff) | |
| download | emacs-02119f8370f4809df202e58bcbc0d568541cd7f3.tar.gz | |
(do-install): Correct previous etc-copying change.
(src/Makefile): Insert --x-libraries option into LD_SWITCH_X_SITE.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 7 |
1 files 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 \ |