X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in.in;h=2ccb3c05b0020d823def65106758e186a7c0652a;hb=118ef6994f663ba34da92c064279935d876dce8a;hp=cb7100226541a2bfc99eb188d56d177c5380c6fa;hpb=f52a96980ed9280f8f906a20d4b899dc0b027644;p=chise%2Fxemacs-chise.git-

diff --git a/Makefile.in.in b/Makefile.in.in
index cb71002..2ccb3c0 100644
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -283,13 +283,14 @@ ${srcdir}/configure : ${srcdir}/configure.in
 ${srcdir}/lib-src/config.values.in : ${srcdir}/configure
 	cd ${srcdir} && $(SHELL) lib-src/config.values.sh
 
-depend ${srcdir}/src/depend :
-	cd ${srcdir}/src && $(RECURSIVE_MAKE) depend
+depend ${srcdir}/src/depend:
+	cd ./src && $(RECURSIVE_MAKE) 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
-	MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' $(SHELL) ${srcdir}/lib-src/update-elc.sh
+	${blddir}/src/${PROGNAME} -batch -vanilla \
+		-l update-elc-2.el -f batch-update-elc-2 lisp
 
 ## Sub-target for all-elc.
 dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
@@ -299,19 +300,19 @@ autoloads: lisp/auto-autoloads.el lisp/custom-load.el
 
 FRC.lisp.auto.autoloads.el:
 lisp/auto-autoloads.el:	FRC.lisp.auto.autoloads.el
-	rm -f lisp/auto-autoloads.el
+	$(RM) lisp/auto-autoloads.el
 	${blddir}/src/${PROGNAME} -batch -vanilla \
 		-l autoload -f batch-update-directory lisp
 	${blddir}/src/${PROGNAME} -batch -vanilla \
 		-f batch-byte-compile lisp/auto-autoloads.el
-	@rm -f lisp/auto-autoloads.el~
+	@$(RM) lisp/auto-autoloads.el~
 #ifdef MULE
-	rm -f lisp/mule/auto-autoloads.el
+	$(RM) lisp/mule/auto-autoloads.el
 	${blddir}/src/${PROGNAME} -batch -vanilla \
 		-l autoload -f batch-update-directory lisp/mule
 	${blddir}/src/${PROGNAME} -batch -vanilla \
 		-f batch-byte-compile lisp/mule/auto-autoloads.el
-	@rm -f lisp/mule/auto-autoloads.el~
+	@$(RM) lisp/mule/auto-autoloads.el~
 #endif
 
 FRC.lisp.custom.load.el:
@@ -439,18 +440,18 @@ install-arch-dep: mkdir
 #ifdef PDUMP
 	${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp
 #endif
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
 	${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__
+# ifdef CYGWIN
 	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
 # else
 	cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
-# endif /* __CYGWIN32__ */
-#endif /* WINDOWSNT */
+# endif /* CYGWIN */
+#endif /* WIN32_NATIVE */
 	if test "${prefix}" != "${exec_prefix}"; then \
 	  $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
 	  for dir in \