X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in.in;h=69496dade8719be9975622e0de55eec710329abb;hb=83ae2cea390538b6148af611d9dae32160eb3bd4;hp=95f1a21e915528edeba0c9337af81207bb766196;hpb=ea1ea793fe6e244ef5555ed983423a204101af13;p=chise%2Fxemacs-chise.git.1

diff --git a/Makefile.in.in b/Makefile.in.in
index 95f1a21..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
@@ -96,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@
 
@@ -202,9 +191,6 @@ 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
@@ -227,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@
@@ -410,29 +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 WINDOWSNT
-	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
-	-chmod 0755 ${bindir}/${PROGNAME}
-#else
 	${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
 	-chmod 0755 ${bindir}/${PROGNAME}-${version}
-# ifdef __CYGWIN32__
-	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
-# else
 	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
-# endif /* __CYGWIN32__ */
-#endif /* WINDOWSNT */
 	if test "${prefix}" != "${exec_prefix}"; then \
 	  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; \
@@ -474,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} ; \
@@ -495,7 +471,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} ${docdir} ${infodir} ${archlibdir} \
+	${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
 	  ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \
 	  ${sitelispdir} ${moduledir} ${sitemoduledir}
 	-chmod 0777 ${lockdir}
@@ -567,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'