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

(src/Makefile): Insert --x-libraries option into LD_SWITCH_X_SITE.

diff --git a/Makefile.in b/Makefile.in
index 071a99e4f6aea87c77bc3724a107b167e348f4e2..b9890fb5c93c26b412f2869eab3a87062a6179ca 100644 (file)
--- 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 \