Commit acfb884c authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(do-install): Correct previous etc-copying change.

(src/Makefile): Insert --x-libraries option into LD_SWITCH_X_SITE.
parent 7b7a9d23
...@@ -278,6 +278,7 @@ src/Makefile: ${srcdir}/src/Makefile.in Makefile ...@@ -278,6 +278,7 @@ src/Makefile: ${srcdir}/src/Makefile.in Makefile
-e 's|^CC *=.*$$|CC='"${CC}"'|' \ -e 's|^CC *=.*$$|CC='"${CC}"'|' \
-e 's|^LN_S *=.*$$|LN_S='"${LN_S}"'|' \ -e 's|^LN_S *=.*$$|LN_S='"${LN_S}"'|' \
-e 's|^CFLAGS *=.*$$|CFLAGS='"${CFLAGS}"'|' \ -e 's|^CFLAGS *=.*$$|CFLAGS='"${CFLAGS}"'|' \
-e 's|^\(LD_SWITCH_X_SITE *=\).*$$|\1'"${LD_SWITCH_X_SITE}"'|' \
-e '/^# DIST: /d') > src/Makefile.tmp -e '/^# DIST: /d') > src/Makefile.tmp
@${srcdir}/move-if-change src/Makefile.tmp src/Makefile @${srcdir}/move-if-change src/Makefile.tmp src/Makefile
chmod -w src/Makefile chmod -w src/Makefile
...@@ -348,9 +349,9 @@ do-install: mkdir ...@@ -348,9 +349,9 @@ do-install: mkdir
rm -f $${subdir}/*~ ; \ rm -f $${subdir}/*~ ; \
done) ; \ done) ; \
done done
[ `(cd etc; /bin/pwd)` != `(cd ${srcdir}/etc; /bin/pwd)` ] \ -[ `(cd ./etc; /bin/pwd)` != `(cd ${srcdir}etc; /bin/pwd)` ] \
&& (echo "Copying etc/DOC* ..." ; \ && (echo "Copying etc/DOC* ..." ; \
(cd etc; tar -cf - DOC*)|(cd ${etcdir}; umask 0; tar -xvf - )) (cd etc; tar -cf - DOC*)|(cd ${etcdir}; umask 0; tar -xvf - ))
-[ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ] \ -[ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ] \
&& (cd ${srcdir}/info ; \ && (cd ${srcdir}/info ; \
if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \ if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment