X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in.in;h=69496dade8719be9975622e0de55eec710329abb;hb=9e004122928715a7579fcbfaf2e85155ac78a432;hp=5d6f4f28b46cf1e9160f95eb4fb9a43126dae096;hpb=2ecbafc1fad0c3a797e078ac76ade7639bd3b925;p=chise%2Fxemacs-chise.git

diff --git a/Makefile.in.in b/Makefile.in.in
index 5d6f4f2..69496da 100644
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -58,6 +58,7 @@ RECURSIVE_MAKE=@RECURSIVE_MAKE@
 
 SHELL = /bin/sh
 LANG = C
+LC_ALL = C
 RM = rm -f
 pwd = /bin/pwd
 
@@ -151,11 +152,22 @@ blddir=@blddir@
 ## themselves in separate directories.
 lispdir=@lispdir@
 
+## Where to install the module files distributed with
+## XEmacs.  This includes the XEmacs version, so that the
+## module files for different versions of XEmacs will install
+## themselves in separate directories.
+moduledir=@moduledir@
+
 ## Directory XEmacs should search for lisp files specific
 ## to this site (i.e. customizations), before consulting
 ## ${lispdir}.
 sitelispdir=@sitelispdir@
 
+## Directory XEmacs should search for module files specific
+## to this site (i.e. customizations), before consulting
+## ${moduledir}.
+sitemoduledir=@sitemoduledir@
+
 ## Where XEmacs will search for its lisp files while
 ## building.  This is only used during the process of
 ## compiling XEmacs, to help XEmacs find its lisp files
@@ -216,7 +228,7 @@ INSTALL_ARCH_DEP_SUBDIR = @INSTALL_ARCH_DEP_SUBDIR@
 ## instead, we have written out explicit code in the `install' targets.
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
-GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize-adjust.h src/config.h lwlib/config.h src/sheap-adjust.h
+GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h lwlib/config.h src/sheap-adjust.h
 GENERATED_LISP = lisp/finder-inf.el
 
 all: ${PROGNAME} all-elc info
@@ -297,12 +309,6 @@ src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad
 	  /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
 	  src/Emacs.ad.h
 
-src/puresize-adjust.h:	${srcdir}/src/puresize.h
-	@echo "Resetting \`src/puresize-adjust.h'."; \
-	(echo "/*	Do not edit this file!" ; \
-	 echo "  	Automatically generated by XEmacs */" ; \
-	 echo "#define PURESIZE_ADJUSTMENT 0") > $@
-
 src/sheap-adjust.h:
 	@echo "Resetting \`src/sheap-adjust.h'."; \
 	(echo "/*	Do not edit this file!" ; \
@@ -466,7 +472,8 @@ MAKEPATH=./lib-src/make-path
 ## make-path instead of mkdir.  Not all mkdirs have the `-p' flag.
 mkdir: FRC.mkdir
 	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
-	  ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir}
+	  ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \
+	  ${sitelispdir} ${moduledir} ${sitemoduledir}
 	-chmod 0777 ${lockdir}
 
 ## Delete all the installed files that the `install' target would
@@ -533,12 +540,9 @@ clean: FRC.clean
 ##      `make distclean' should leave only the files that were in the
 ##      distribution.
 top_distclean=\
-	$(RM) config.status config.log config-tmp-* build-install Installation ; \
-	for d in src lib-src lwlib dynodump ; do \
-	  $(RM) $$d/Makefile $$d/Makefile.in ; \
-	done ; \
-	$(RM) core .sbinit Makefile Makefile.in lock/*; \
-	$(RM) lisp/finder-inf.el* Installation.el Installation.elc; \
+	$(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) packages mule-packages site-lisp
 
 distclean: FRC.distclean