* s/dgux.h: Move #definition of SYSTEM_MALLOC outside of

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index d0a902f95cc771ec851d95e11ccab5e0b34a8a34..e50afa1a54cac310911984178030d6b7761cd40e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,6 +43,7 @@ LN_S=@LN_S@
 CFLAGS=@CFLAGS@
 C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
 LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
+YACC=@YACC@
 
 ### These help us choose version- and architecture-specific directories
 ### to install files in.
@@ -256,6 +257,7 @@ lib-src/Makefile: ${srcdir}/lib-src/Makefile.in Makefile
          -e 's|^\(VPATH *=\).*$$|\1'"${srcdir}"'/lib-src|'             \
          -e 's|^\(archlibdir *=\).*$$|\1'"${archlibdir}"'|'            \
          -e 's|^\(ALLOCA *=\).*$$|\1'"${ALLOCA}"'|'                    \
+         -e 's|^\(YACC *=\).*$$|\1'"${YACC}"'|'                        \
          -e 's|^CC *=.*$$|CC='"${CC}"'|'                               \
          -e 's|^CFLAGS *=.*$$|CFLAGS='"${CFLAGS}"'|' \
          -e 's|^C_SWITCH_SYSTEM *=.*$$|C_SWITCH_SYSTEM='"${C_SWITCH_SYSTEM}"'|' \
@@ -278,6 +280,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
@@ -319,6 +322,8 @@ Makefile:
 ## source exists and is distinct from the destination.
 install: all do-install
 
+### Note that we copy the DOC-* files from the build etc directory
+### as well as lots of things from ${srcdir}/etc.
 do-install: mkdir
        (cd lib-src; \
          $(MAKE) install ${MFLAGS} prefix=${prefix} \
@@ -338,7 +343,7 @@ do-install: mkdir
           [ -d $${dir} ] \
           && [ `(cd $${dir} && /bin/pwd)` != `(cd $${dest} && /bin/pwd)` ] \
           && (echo "Copying $${dir}..." ; \
-              (cd $${dir}; tar cf - . )|(cd $${dest}; umask 0; tar xvf - ); \
+              (cd $${dir}; tar -cf - . )|(cd $${dest};umask 0; tar -xvf - ); \
               for subdir in `find $${dest} -type d ! -name RCS -print` ; do \
                 rm -rf $${subdir}/RCS ; \
                 rm -rf $${subdir}/CVS ; \
@@ -346,14 +351,20 @@ do-install: mkdir
                 rm -f  $${subdir}/*~ ; \
               done) ; \
         done
-       -[ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ] \
-        && (cd ${srcdir}/info ; \
+       if [ `(cd ./etc; /bin/pwd)` != `(cd ${srcdir}/etc; /bin/pwd)` ]; \
+       then \
+          echo "Copying etc/DOC* ..." ; \
+          (cd etc; tar -cf - DOC*)|(cd ${etcdir}; umask 0; tar -xvf - ); \
+       else true; fi
+       if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+       then (cd ${srcdir}/info ; \
             if [ ! -f ${infodir}/dir ] && [ -f dir ]; then \
               ${INSTALL_DATA} dir ${infodir}/dir ; \
             fi ; \
             for f in cl* emacs* forms* info* vip* ; do \
               ${INSTALL_DATA} $$f ${infodir}/$$f ; \
-            done)
+            done); \
+       else true; fi
        cd ${srcdir}/etc; for page in emacs etags ctags ; do \
          ${INSTALL_DATA} $${page}.1 ${mandir}/$${page}${manext} ; \
        done