This commit was manufactured by cvs2svn to create branch 'XEmacs-21_4'.

[chise/xemacs-chise.git.1] / Makefile.in.in

diff --git a/Makefile.in.in b/Makefile.in.in
index 95f1a21..8a0b9f0 100644 (file)
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -63,7 +63,9 @@ SHELL = /bin/sh
 LANG = C
 LC_ALL = C
 RM = rm -f
+MAKEPATH=./lib-src/make-path
 pwd = /bin/pwd
+TAR = tar
 
 ## ==================== Things `configure' Might Edit ====================
 
@@ -259,7 +261,7 @@ ${PROGNAME}:        ${GENERATED_HEADERS} ${MAKE_SUBDIR} ${GENERATED_LISP}
 .PHONY: ${SUBDIR} all beta all-elc all-elcs dump-elc dump-elcs autoloads finder
 
 ## Convenience target for XEmacs beta testers
-beta: clean all-elc finder
+beta: clean all-elc finder info
 
 ## Convenience target for XEmacs maintainers
 ## This would run `make-xemacsdist' if I were really confident that everything
@@ -273,30 +275,31 @@ dist: all-elc info
 ## - src/depend from src/*.[ch]
 .PHONY: config configure depend
 config: configure depend
-configure: ${srcdir}/configure
-${srcdir}/configure: ${srcdir}/configure.in
+configure: ${srcdir}/configure ${srcdir}/lib-src/config.values.in
+
+${srcdir}/configure : ${srcdir}/configure.in
        cd ${srcdir} && autoconf
-       cd ${srcdir} && /bin/sh lib-src/config.values.sh
 
-depend ${srcdir}/src/depend:
-       cd ${srcdir}/src && \
-               perl ./make-src-depend > depend.tmp && \
-               $(RM) depend && mv depend.tmp depend
+${srcdir}/lib-src/config.values.in : ${srcdir}/configure
+       cd ${srcdir} && $(SHELL) lib-src/config.values.sh
+
+depend ${srcdir}/src/depend :
+       cd ${srcdir}/src && $(RECURSIVE_MAKE) depend
 
 ## Build XEmacs and recompile out-of-date and missing .elc files along
 ## the way.
 all-elc all-elcs: lib-src lwlib dump-elcs src
-       MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-elc.sh
+       MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' $(SHELL) ${srcdir}/lib-src/update-elc.sh
 
 ## Sub-target for all-elc.
 dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
        cd ./src && $(RECURSIVE_MAKE) dump-elcs
 
 autoloads: src
-       MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-autoloads.sh
+       MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' $(SHELL) ${srcdir}/lib-src/update-autoloads.sh
 
 custom-loads:
-       MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-custom.sh
+       MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' $(SHELL) ${srcdir}/lib-src/update-custom.sh
 
 finder: src
        @echo "Building finder database ..."
@@ -323,7 +326,7 @@ src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad
        @(echo "/*      Do not edit this file!" ; \
          echo "        Automatically generated from ${srcdir}/etc/Emacs.ad" ; \
          echo " */" ; \
-         /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
+         $(SHELL) ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
          src/Emacs.ad.h
 
 src/sheap-adjust.h:
@@ -428,6 +431,7 @@ install-arch-dep: mkdir
 # endif /* __CYGWIN32__ */
 #endif /* WINDOWSNT */
        if test "${prefix}" != "${exec_prefix}"; then \
+         $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
          for dir in \
                lib/${inststaticdir} \
                lib/${instvardir}/etc \
@@ -457,8 +461,8 @@ install-arch-indep: mkdir info
             -a "`(cd $${dir} && $(pwd))`" != \
                "`(cd $${dest} && $(pwd))`" \
           && (echo "Copying $${dir}..." ; \
-              (cd $${dir} && tar -cf - . ) | \
-               (cd $${dest} && umask 022 && tar -xf - );\
+              (cd $${dir} && $(TAR) -cf - . ) | \
+               (cd $${dest} && umask 022 && $(TAR) -xf - );\
               chmod 0755 $${dest}; \
               for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \
                 (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \
@@ -487,9 +491,8 @@ install-arch-indep: mkdir info
        @echo "${lispdir}"
 
 gzip-el:
-       ${srcdir}/lib-src/gzip-el.sh ${lispdir}
+       $(SHELL) ${srcdir}/lib-src/gzip-el.sh ${lispdir}
 
-MAKEPATH=./lib-src/make-path
 ## Build all the directories to install XEmacs in.
 ## Since we may be creating several layers of directories,
 ## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use