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

[gnu-emacs] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a786b359a30137088c20d40463d004e31530c475..e50afa1a54cac310911984178030d6b7761cd40e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,6 +42,8 @@ ALLOCA=@ALLOCA@
 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.
@@ -210,7 +212,7 @@ removenullpaths=sed -e 's/^://' -e 's/:$$//' -e 's/::/:/'
 # something notable, so the only unnecessary work we do is in building
 # src/paths.h.tmp, which isn't much.
 # Note that sed is not in /bin on 386bsd.
-src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC
+src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC.src.paths.h
        @echo "Producing \`src/paths.h' from \`src/paths.h.in'."
        @(lisppath=`echo ${lisppath} | ${removenullpaths}` ;            \
          buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;  \
@@ -223,7 +225,8 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC
          -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";')
        @${srcdir}/move-if-change src/paths.h.tmp src/paths.h
 
-src:   lib-src
+src:   lib-src FRC.src
+lib-src: FRC.lib-src
 
 .RECURSIVE: ${SUBDIR}
 
@@ -254,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}"'|' \
@@ -276,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
@@ -317,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} \
@@ -324,7 +331,7 @@ do-install: mkdir
            archlibdir=${archlibdir})
        -set ${COPYDESTS} ; \
         for dir in ${COPYDIR} ; do \
-          if [ `(cd $$1 ; pwd)` != `(cd $${dir} ; pwd)` ] ; then \
+          if [ `(cd $$1 && pwd)` != `(cd $${dir} && pwd)` ] ; then \
             rm -rf $$1 ; \
           fi ; \
           shift ; \
@@ -334,9 +341,9 @@ do-install: mkdir
         for dir in ${COPYDIR} ; do \
           dest=$$1 ; shift ; \
           [ -d $${dir} ] \
-          && [ `(cd $${dir}; /bin/pwd)` != `(cd $${dest}; /bin/pwd)` ] \
+          && [ `(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 ; \
@@ -344,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
@@ -364,13 +377,15 @@ do-install: mkdir
 ### we may be creating several layers of directories (for example,
 ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use make-path
 ### instead of mkdir.  Not all systems' mkdirs have the `-p' flag.
-mkdir: FRC
+mkdir: FRC.mkdir
        ./lib-src/make-path ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \
          ${bindir} ${datadir} ${libdir} \
          `echo ${locallisppath} | sed 's/:/ /'`
        chmod 777 ${COPYDESTS} ${lockdir}
 
-FRC:
+### Some makes seem to remember that they've built something called FRC,
+### so you can only use a given FRC once per makefile.
+FRC FRC.src.paths.h FRC.src FRC.lib-src FRC.mkdir:
 
 
 # ==================== Cleaning up and miscellanea ====================
@@ -391,7 +406,7 @@ clean mostlyclean:
        cd src; $(MAKE) clean
        cd lib-src; $(MAKE) clean
        cd oldXMenu; $(MAKE) clean
-       if [ `(cd ${etcdir} ; /bin/pwd)` != `(cd etc; /bin/pwd)` ] ; then \
+       if [ `(cd ${etcdir} && /bin/pwd)` != `(cd etc && /bin/pwd)` ] ; then \
          cd etc; $(MAKE) clean; \
        else true; \
        fi