X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in.in;h=fbd73f978a54df716a3c11f9b9844816b26fccad;hb=947017733d7dfdc94cee74bb3397edc1968e6b6e;hp=04c18053d675a45aa5c3768fa2b5a7c1e1cc5b5a;hpb=98a6e4055a1fa624c592ac06f79287d55196ca37;p=chise%2Fxemacs-chise.git

diff --git a/Makefile.in.in b/Makefile.in.in
index 04c1805..fbd73f9 100644
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -74,6 +74,7 @@ CPP=@CPP@
 LN_S=@LN_S@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
+LDFLAGS=@LDFLAGS@
 
 ## These help us choose version- and architecture-specific directories
 ## to install files in.
@@ -239,8 +240,13 @@ INSTALL_ARCH_DEP_SUBDIR = @INSTALL_ARCH_DEP_SUBDIR@
 ## When installing the info files, we need to do special things to
 ## avoid nuking an existing dir file, so we don't do that here;
 ## instead, we have written out explicit code in the `install' targets.
+#ifdef HAVE_CHISE
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
+#else
+COPYDIR = ${srcdir}/etc ${srcdir}/lisp
+COPYDESTS = ${etcdir} ${lispdir}
+#endif
 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
 
@@ -282,20 +288,24 @@ depend ${srcdir}/src/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
+all-elc all-elcs: autoloads dump-elcs
 	${blddir}/src/${PROGNAME} -batch -vanilla \
 		-l update-elc-2.el -f batch-update-elc-2 lisp
+#ifdef UTF2000
+	${blddir}/src/${PROGNAME} -batch -vanilla \
+		-l update-elc-2.el -f batch-update-elc-2 lisp/utf-2000
+#endif
 
 ## 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
+autoloads: lib-src lwlib src 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 \
+	${blddir}/src/${PROGNAME} -batch -no-autoloads \
 		-l autoload -f batch-update-directory lisp
 	${blddir}/src/${PROGNAME} -batch -vanilla \
 		-f batch-byte-compile lisp/auto-autoloads.el
@@ -308,9 +318,17 @@ lisp/auto-autoloads.el:	FRC.lisp.auto.autoloads.el
 		-f batch-byte-compile lisp/mule/auto-autoloads.el
 	@$(RM) lisp/mule/auto-autoloads.el~
 #endif
+#ifdef UTF2000
+	$(RM) lisp/utf-2000/auto-autoloads.el
+	${blddir}/src/${PROGNAME} -batch -vanilla \
+		-l autoload -f batch-update-directory lisp/utf-2000
+	${blddir}/src/${PROGNAME} -batch -vanilla \
+		-f batch-byte-compile lisp/utf-2000/auto-autoloads.el
+	@$(RM) lisp/utf-2000/auto-autoloads.el~
+#endif
 
 FRC.lisp.custom.load.el:
-lisp/custom-load.el: FRC.lisp.custom.load.el
+lisp/custom-load.el: FRC.lisp.custom.load.el lisp/auto-autoloads.el
 	${blddir}/src/${PROGNAME} -batch -vanilla -l cus-dep \
 		-f Custom-make-dependencies lisp
 
@@ -499,6 +517,15 @@ install-arch-indep: mkdir info
 	    ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \
 	    chmod 0644 ${mandir}/$${page}${manext} ; \
 	  done
+#ifdef HAVE_LIBCHISE
+	${LN_S} ${etcdir}/chise-db `${blddir}/src/${PROGNAME} -batch -vanilla -eval "\
+(let ((path (expand-file-name \"db\" chise-db-directory)))\
+  (if (file-exists-p chise-db-directory)\
+      (if (file-exists-p path)\
+	  (delete-file path))\
+    (make-directory chise-db-directory t))\
+  (princ path))"`
+#endif
 	@echo "If you would like to save approximately 2M of disk space, do"
 	@echo "make gzip-el"
 	@echo "or you may run "