X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in.in;h=69496dade8719be9975622e0de55eec710329abb;hb=83ae2cea390538b6148af611d9dae32160eb3bd4;hp=10150e6324a430c2921ab97a5e8c2f5f13e148b6;hpb=40402600969429d5253e62c6314a3eebbb21f027;p=chise%2Fxemacs-chise.git.1 diff --git a/Makefile.in.in b/Makefile.in.in index 10150e6..69496da 100644 --- a/Makefile.in.in +++ b/Makefile.in.in @@ -49,9 +49,6 @@ ## make extraclean ## Still more severe - delete backup and autosave files, too. -#define NOT_C_CODE -#include "src/config.h" - #ifdef USE_GNU_MAKE RECURSIVE_MAKE=$(MAKE) #else @@ -63,9 +60,7 @@ 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 ==================== @@ -98,14 +93,6 @@ PROGNAME=@PROGNAME@ ## not need to change them. This defaults to /usr/local. prefix=@prefix@ -## Variable data (as per each program update) goes here -## The default is ${PROGNAME} -inststaticdir=@inststaticdir@ - -## Static data (constant across program updates) goes here -## The default is ${PROGNAME}-${version} -instvardir=@instvardir@ - ## Like `prefix', but used for architecture-specific files. exec_prefix=@exec_prefix@ @@ -123,6 +110,7 @@ pkgdir=@pkgdir@ ## Where to install and expect the files that XEmacs modifies as it runs. ## These files are all architecture-independent. Right now, the ## only such data is the locking directory; +## ${lockdir} is a subdirectory of this. statedir=@statedir@ ## Where to install and expect executable files to be run by XEmacs @@ -198,8 +186,10 @@ buildlispdir=${srcdir}/lisp ## at once. etcdir=@etcdir@ -## Where to put the DOC file. -docdir=@docdir@ +## Where to create and expect the locking directory, where +## the XEmacs locking code keeps track of which files are +## currently being edited. +lockdir=@lockdir@ ## Where to put executables to be run by XEmacs rather than ## the user. This path usually includes the XEmacs version @@ -223,10 +213,7 @@ INSTALL_DATA = @INSTALL_DATA@ MAKE_SUBDIR = @MAKE_SUBDIR@ ## Subdirectories that can be made recursively. -SUBDIR = ${MAKE_SUBDIR} man - -## Subdirectories that must be cleaned on distclean -SUBDIR_DISTCLEAN = ${SUBDIR} modules/sample modules/ldap modules/zlib modules/base64 +SUBDIR = ${MAKE_SUBDIR} man ## The makefiles of the directories in ${MAKE_SUBDIR}. SUBDIR_MAKEFILES = @SUBDIR_MAKEFILES@ @@ -255,7 +242,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 info +beta: clean all-elc finder ## Convenience target for XEmacs maintainers ## This would run `make-xemacsdist' if I were really confident that everything @@ -269,42 +256,30 @@ dist: all-elc info ## - src/depend from src/*.[ch] .PHONY: config configure depend config: configure depend -configure: ${srcdir}/configure ${srcdir}/lib-src/config.values.in - -${srcdir}/configure : ${srcdir}/configure.in +configure: ${srcdir}/configure +${srcdir}/configure: ${srcdir}/configure.in cd ${srcdir} && autoconf - -${srcdir}/lib-src/config.values.in : ${srcdir}/configure - cd ${srcdir} && $(SHELL) lib-src/config.values.sh + cd ${srcdir} && /bin/sh lib-src/config.values.sh depend ${srcdir}/src/depend: - cd ./src && $(RECURSIVE_MAKE) depend + cd ${srcdir}/src && \ + perl ./make-src-depend > depend.tmp && \ + $(RM) depend && mv depend.tmp 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 - ${blddir}/src/${PROGNAME} -batch -vanilla \ - -l update-elc-2.el -f batch-update-elc-2 lisp + MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${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: lisp/auto-autoloads.el lisp/custom-load.el - -FRC.lisp.auto.autoloads.el: -lisp/auto-autoloads.el: FRC.lisp.auto.autoloads.el - $(RM) lisp/auto-autoloads.el - ${blddir}/src/${PROGNAME} -batch -vanilla \ - -l autoload -f batch-update-directory lisp - ${blddir}/src/${PROGNAME} -batch -vanilla \ - -f batch-byte-compile lisp/auto-autoloads.el - @$(RM) lisp/auto-autoloads.el~ +autoloads: src + MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-autoloads.sh -FRC.lisp.custom.load.el: -lisp/custom-load.el: FRC.lisp.custom.load.el - ${blddir}/src/${PROGNAME} -batch -vanilla -l cus-dep \ - -f Custom-make-dependencies lisp +custom-loads: + MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-custom.sh finder: src @echo "Building finder database ..." @@ -331,7 +306,7 @@ src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad @(echo "/* Do not edit this file!" ; \ echo " Automatically generated from ${srcdir}/etc/Emacs.ad" ; \ echo " */" ; \ - $(SHELL) ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \ + /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \ src/Emacs.ad.h src/sheap-adjust.h: @@ -418,33 +393,21 @@ install-arch-dep: mkdir if test -f ../Installation; then \ ${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \ fi; \ - ${INSTALL_DATA} lib-src/config.values ${docdir}/config.values; \ - ${INSTALL_DATA} lib-src/DOC ${docdir}/DOC; \ + for f in DOC config.values; do \ + ${INSTALL_DATA} lib-src/$${f} ${archlibdir}/$${f}; \ + done ; \ for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \ do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ else true; fi -#ifdef PDUMP - ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp -#endif -#ifdef WIN32_NATIVE - ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} - -chmod 0755 ${bindir}/${PROGNAME} -#else ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version} -chmod 0755 ${bindir}/${PROGNAME}-${version} -# ifdef CYGWIN - cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} -# else cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} -# endif /* CYGWIN */ -#endif /* WIN32_NATIVE */ if test "${prefix}" != "${exec_prefix}"; then \ - $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \ for dir in \ - lib/${inststaticdir} \ - lib/${instvardir}/etc \ - lib/${instvardir}/info \ - lib/${instvardir}/lisp; do \ + lib/${PROGNAME} \ + lib/${PROGNAME}-${version}/etc \ + lib/${PROGNAME}-${version}/info \ + lib/${PROGNAME}-${version}/lisp; do \ if test ! -d ${exec_prefix}/$${dir}; then \ $(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \ done; \ @@ -469,8 +432,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 \#* *~) ; \ @@ -486,6 +449,7 @@ install-arch-indep: mkdir info chmod 0644 ${infodir}/$${file}; \ done ; \ fi + ## Note it's `xemacs' not ${PROGNAME} cd ${srcdir}/etc && \ for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ @@ -499,16 +463,18 @@ install-arch-indep: mkdir info @echo "${lispdir}" gzip-el: - $(SHELL) ${srcdir}/lib-src/gzip-el.sh ${lispdir} + ${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 ## make-path instead of mkdir. Not all mkdirs have the `-p' flag. mkdir: FRC.mkdir - ${MAKEPATH} ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ + ${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \ ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \ ${sitelispdir} ${moduledir} ${sitemoduledir} + -chmod 0777 ${lockdir} ## Delete all the installed files that the `install' target would ## create (but not the noninstalled files such as `make all' would @@ -577,10 +543,10 @@ top_distclean=\ $(RM) config.status config.log confdefs.h config-tmp-* build-install Installation ; \ $(RM) core .sbinit lock/* GNUmakefile Makefile Makefile.in ; \ $(RM) lisp/finder-inf.el* Installation.el Installation.elc ; \ - $(RM) -r site-packages xemacs-packages mule-packages site-lisp + $(RM) packages mule-packages site-lisp distclean: FRC.distclean - for d in $(SUBDIR_DISTCLEAN); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done + for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done -${top_distclean} ## `realclean'