Sync up with r21-4-14-chise-0_21-22.

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

diff --git a/Makefile.in.in b/Makefile.in.in
index 2ccb3c0..c81def8 100644 (file)
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -123,7 +123,6 @@ pkgdir=@pkgdir@
 ## Where to install and expect the files that XEmacs modifies as it runs.
 ## These files are all architecture-independent. Right now, the
 ## only such data is the locking directory;
-## ${lockdir} is a subdirectory of this.
 statedir=@statedir@
 
 ## Where to install and expect executable files to be run by XEmacs
@@ -199,11 +198,6 @@ buildlispdir=${srcdir}/lisp
 ## at once.
 etcdir=@etcdir@
 
-## Where to create and expect the locking directory, where
-## the XEmacs locking code keeps track of which files are
-## currently being edited.
-lockdir=@lockdir@
-
 ## Where to put the DOC file.
 docdir=@docdir@
 
@@ -291,6 +285,10 @@ depend ${srcdir}/src/depend:
 all-elc all-elcs: lib-src lwlib dump-elcs src
        ${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
@@ -314,6 +312,14 @@ 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
@@ -520,10 +526,9 @@ gzip-el:
 ## (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} ${docdir} ${infodir} ${archlibdir} \
          ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \
          ${sitelispdir} ${moduledir} ${sitemoduledir}
-       -chmod 0777 ${lockdir}
 
 ## Delete all the installed files that the `install' target would
 ## create (but not the noninstalled files such as `make all' would