update.

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

diff --git a/Makefile.in.in b/Makefile.in.in
index 92f8f30..e8205ae 100644 (file)
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -93,6 +93,14 @@ 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@
 
@@ -191,6 +199,9 @@ etcdir=@etcdir@
 ## 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
@@ -228,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}
-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
@@ -309,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
 
-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!" ; \
@@ -399,9 +404,8 @@ install-arch-dep: mkdir
           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
@@ -410,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 \
-               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; \
@@ -455,7 +459,6 @@ 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} ; \
@@ -477,7 +480,7 @@ 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
-       ${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
+       ${MAKEPATH} ${COPYDESTS} ${lockdir} ${docdir} ${infodir} ${archlibdir} \
          ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \
          ${sitelispdir} ${moduledir} ${sitemoduledir}
        -chmod 0777 ${lockdir}