X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=inline;f=Makefile.in.in;h=e6e0eacf88ec6c7b89f7bb4ac81c20fba489f2c8;hb=1901576713f07eb5a3ef7e31fee05f6424e12dd0;hp=cb7100226541a2bfc99eb188d56d177c5380c6fa;hpb=f52a96980ed9280f8f906a20d4b899dc0b027644;p=chise%2Fxemacs-chise.git-

diff --git a/Makefile.in.in b/Makefile.in.in
index cb71002..e6e0eac 100644
--- a/Makefile.in.in
+++ b/Makefile.in.in
@@ -299,19 +299,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 +439,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 \