projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(insert-char-data): Modify order when CHAR does not have
[chise/xemacs-chise.git-]
/
Makefile.in.in
diff --git
a/Makefile.in.in
b/Makefile.in.in
index
d1002e1
..
e8205ae
100644
(file)
--- a/
Makefile.in.in
+++ b/
Makefile.in.in
@@
-58,6
+58,7
@@
RECURSIVE_MAKE=@RECURSIVE_MAKE@
SHELL = /bin/sh
LANG = C
SHELL = /bin/sh
LANG = C
+LC_ALL = C
RM = rm -f
pwd = /bin/pwd
RM = rm -f
pwd = /bin/pwd
@@
-92,6
+93,14
@@
PROGNAME=@PROGNAME@
## not need to change them. This defaults to /usr/local.
prefix=@prefix@
## 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@
## Like `prefix', but used for architecture-specific files.
exec_prefix=@exec_prefix@
@@
-151,11
+160,22
@@
blddir=@blddir@
## themselves in separate directories.
lispdir=@lispdir@
## 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 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
## 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
@@
-179,6
+199,9
@@
etcdir=@etcdir@
## currently being edited.
lockdir=@lockdir@
## currently being edited.
lockdir=@lockdir@
+# Where to put the DOC file.
+docdir=@docdir@
+
## Where to put executables to be run by XEmacs rather than
## the user. This path usually includes the XEmacs version
## and configuration name, so that multiple configurations
## Where to put executables to be run by XEmacs rather than
## the user. This path usually includes the XEmacs version
## and configuration name, so that multiple configurations
@@
-216,7
+239,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}
## 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
GENERATED_LISP = lisp/finder-inf.el
all: ${PROGNAME} all-elc info
@@
-297,12
+320,6
@@
src/Emacs.ad.h: ${srcdir}/etc/Emacs.ad
/bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
src/Emacs.ad.h
/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!" ; \
src/sheap-adjust.h:
@echo "Resetting \`src/sheap-adjust.h'."; \
(echo "/* Do not edit this file!" ; \
@@
-387,9
+404,8
@@
install-arch-dep: mkdir
if test -f ../Installation; then \
${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \
fi; \
if test -f ../Installation; then \
${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \
fi; \
- for f in DOC config.values; do \
- ${INSTALL_DATA} lib-src/$${f} ${archlibdir}/$${f}; \
- done ; \
+ ${INSTALL_DATA} lib-src/config.values ${docdir}/config.values; \
+ ${INSTALL_DATA} lib-src/DOC ${docdir}/DOC; \
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
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
@@
-398,10
+414,10
@@
install-arch-dep: mkdir
cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
if test "${prefix}" != "${exec_prefix}"; then \
for dir in \
cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
if test "${prefix}" != "${exec_prefix}"; then \
for dir in \
- lib/${PROGNAME} \
- lib/${PROGNAME}-${version}/etc \
- lib/${PROGNAME}-${version}/info \
- lib/${PROGNAME}-${version}/lisp; do \
+ lib/${inststaticdir} \
+ lib/${instvardir}/etc \
+ lib/${instvardir}/info \
+ lib/${instvardir}/lisp; do \
if test ! -d ${exec_prefix}/$${dir}; then \
$(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \
done; \
if test ! -d ${exec_prefix}/$${dir}; then \
$(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \
done; \
@@
-443,7
+459,6
@@
install-arch-indep: mkdir info
chmod 0644 ${infodir}/$${file}; \
done ; \
fi
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} ; \
cd ${srcdir}/etc && \
for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \
${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
@@
-465,8
+480,9
@@
MAKEPATH=./lib-src/make-path
## (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
## (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} ${lockdir} ${infodir} ${archlibdir} \
- ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir}
+ ${MAKEPATH} ${COPYDESTS} ${lockdir} ${docdir} ${infodir} ${archlibdir} \
+ ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \
+ ${sitelispdir} ${moduledir} ${sitemoduledir}
-chmod 0777 ${lockdir}
## Delete all the installed files that the `install' target would
-chmod 0777 ${lockdir}
## Delete all the installed files that the `install' target would
@@
-533,7
+549,7
@@
clean: FRC.clean
## `make distclean' should leave only the files that were in the
## distribution.
top_distclean=\
## `make distclean' should leave only the files that were in the
## distribution.
top_distclean=\
- $(RM) config.status config.log config-tmp-* build-install Installation ; \
+ $(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
$(RM) core .sbinit lock/* GNUmakefile Makefile Makefile.in ; \
$(RM) lisp/finder-inf.el* Installation.el Installation.elc ; \
$(RM) packages mule-packages site-lisp