X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/44257b1a3dcb1400fcecfca6fbd022a31bd925ee..314ed6a5aa357c4b55f3a897def29869a02dd752:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 101fd8d75d..101b7d6eeb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -276,13 +276,14 @@ src/Makefile: ${srcdir}/src/Makefile.in Makefile
 	  echo "# Emacs build tree instead, or editing" ;		\
 	  echo "# \`${srcdir}/src/Makefile.in' itself." ;		\
 	  sed < ${srcdir}/src/Makefile.in				\
-	  -e 's|^\(srcdir *=\).*$$|\1'"${srcdir}"'/src|'		\
-	  -e 's|^\(VPATH *=\).*$$|\1'"${srcdir}"'/src|'			\
-	  -e 's|^CC *=.*$$|CC='"${CC}"'|'				\
-	  -e 's|^CPP *=.*$$|CPP='"${CPP}"'|'				\
-	  -e 's|^LN_S *=.*$$|LN_S='"${LN_S}"'|'				\
-	  -e 's|^CFLAGS *=.*$$|CFLAGS='"${CFLAGS}"'|' 			\
-	  -e 's|^\(LD_SWITCH_X_SITE *=\).*$$|\1'"${LD_SWITCH_X_SITE}"'|'	\
+	  -e 's|^\(srcdir *=\).*$$|\1${srcdir}/src|'			\
+	  -e 's|^\(VPATH *=\).*$$|\1${srcdir}/src|'			\
+	  -e 's|^CC *=.*$$|CC=${CC}|'					\
+	  -e 's|^CPP *=.*$$|CPP=${CPP}|'				\
+	  -e 's|^LN_S *=.*$$|LN_S=${LN_S}|'				\
+	  -e 's|^CFLAGS *=.*$$|CFLAGS=${CFLAGS}|' 			\
+	  -e 's|^\(C_SWITCH_SYSTEM *=\).*$$|\1'"${C_SWITCH_SYSTEM}"'|'	\
+	  -e 's|^\(LD_SWITCH_X_SITE *=\).*$$|\1${LD_SWITCH_X_SITE}|'	\
 	  -e '/^# DIST: /d') > src/Makefile.tmp
 	@${srcdir}/move-if-change src/Makefile.tmp src/Makefile
 	chmod -w src/Makefile
@@ -452,7 +453,7 @@ clean: FRC.clean
 top_distclean=\
 	rm -f config.status build-install ; \
 	rm -f Makefile ${SUBDIR_MAKEFILES} ; \
-	(cd lock ; rm *)
+	(cd lock ; rm -f *)
 distclean: FRC.distclean
 	(cd src;      make ${MFLAGS} distclean)
 	(cd oldXMenu; make ${MFLAGS} distclean)