lisp/ * Makefile.in (src/paths.h): Don't echo the huge sed command we

use to build paths.h. (lib-src/Makefile, src/Makefile): Similarly.
author: Jim Blandy 1993-03-30 21:31:15 +0000
committer: Jim Blandy 1993-03-30 21:31:15 +0000
commit: 7987a1696f3a80859f0396e54145dc525e5ea4bf (patch)
tree: c871fa479b49db5d6ac41688e2bf54e3ada3c9d7
parent: f298026408cb2c7216eeed489c01ad1f20858980 (diff)
download: emacs-7987a1696f3a80859f0396e54145dc525e5ea4bf.tar.gz
emacs-7987a1696f3a80859f0396e54145dc525e5ea4bf.zip
1 files changed, 39 insertions, 38 deletions
diff --git a/Makefile.in b/Makefile.in
index 2c752761380..f72d83454bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -213,14 +213,15 @@ removenullpaths=sed -e 's/^://' -e 's/:$$//' -e 's/::/:/'
 # src/paths.h.tmp, which isn't much.
 # Note that sed is not in /bin on 386bsd.
 src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC
-        lisppath=`echo ${lisppath} | ${removenullpaths}` ;              \
+        @echo "Producing \`src/paths.h' from \`src/paths.h.in'."
-        buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;    \
+        @(lisppath=`echo ${lisppath} | ${removenullpaths}` ;            \
-        sed < ${srcdir}/src/paths.h.in > src/paths.h.tmp                \
+          buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ;  \
-        -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'          \
+          sed < ${srcdir}/src/paths.h.in > src/paths.h.tmp              \
-        -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
+          -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";'        \
-        -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'                 \
+          -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
-        -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'                     \
+          -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";'               \
-        -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";'
+          -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";'                   \
+          -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";')
        ${srcdir}/move-if-change src/paths.h.tmp src/paths.h
 src:    lib-src
@@ -237,42 +238,42 @@ ${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
 ## when the user has built them from this makefile once, they will use
 ## the right default values for the path variables.
 lib-src/Makefile: ${srcdir}/lib-src/Makefile.in Makefile
-        echo "Producing \`lib-src/Makefile' from \`${srcdir}/lib-src/Makefile.in'."
        rm -f lib-src/Makefile.tmp
-        (echo "# This file is generated from \`${srcdir}/lib-src/Makefile.in'." ; \
+        @echo "Producing \`lib-src/Makefile' from \`${srcdir}/lib-src/Makefile.in'."
-         echo "# If you are thinking about editing it, you should seriously consider" ; \
+        @(echo "# This file is generated from \`${srcdir}/lib-src/Makefile.in'." ; \
-         echo "# running \`make lib-src/Makefile' at the top of the" ;  \
+          echo "# If you are thinking about editing it, you should seriously consider" ; \
-         echo "# Emacs build tree instead, or editing" ;                \
+          echo "# running \`make lib-src/Makefile' at the top of the" ; \
-         echo "# \`${srcdir}/lib-src/Makefile.in' itself." ;            \
+          echo "# Emacs build tree instead, or editing" ;               \
-         /bin/sed < ${srcdir}/lib-src/Makefile.in                       \
+          echo "# \`${srcdir}/lib-src/Makefile.in' itself." ;           \
-         -e 's|^\(version *=\).*$$|\1'"${version}"'|'                   \
+          /bin/sed < ${srcdir}/lib-src/Makefile.in                      \
-         -e 's|^\(configname *=\).*$$|\1'"${configname}"'|'             \
+          -e 's|^\(version *=\).*$$|\1'"${version}"'|'                  \
-         -e 's|^\(prefix *=\).*$$|\1'"${prefix}"'|'                     \
+          -e 's|^\(configname *=\).*$$|\1'"${configname}"'|'            \
-         -e 's|^\(exec_prefix *=\).*$$|\1'"${exec_prefix}"'|'           \
+          -e 's|^\(prefix *=\).*$$|\1'"${prefix}"'|'                    \
-         -e 's|^\(libdir *=\).*$$|\1'"${libdir}"'|'                     \
+          -e 's|^\(exec_prefix *=\).*$$|\1'"${exec_prefix}"'|'          \
-         -e 's|^\(srcdir *=\).*$$|\1'"${srcdir}"'|'                     \
+          -e 's|^\(libdir *=\).*$$|\1'"${libdir}"'|'                    \
-         -e 's|^\(archlibdir *=\).*$$|\1'"${archlibdir}"'|'             \
+          -e 's|^\(srcdir *=\).*$$|\1'"${srcdir}"'|'                    \
-         -e 's|^CC *=.*$$|CC='"${CC}"'|'                                \
+          -e 's|^\(archlibdir *=\).*$$|\1'"${archlibdir}"'|'            \
-         -e 's|^CONFIG_CFLAGS *=.*$$|CONFIG_CFLAGS='"${CONFIG_CFLAGS}"'|' \
+          -e 's|^CC *=.*$$|CC='"${CC}"'|'                               \
-         -e 's|^C_SWITCH_SYSTEM *=.*$$|C_SWITCH_SYSTEM='"${C_SWITCH_SYSTEM}"'|' \
+          -e 's|^CONFIG_CFLAGS *=.*$$|CONFIG_CFLAGS='"${CONFIG_CFLAGS}"'|' \
-         -e 's|^LOADLIBES *=.*$$|LOADLIBES='"${libsrc_libs}"'|'         \
+          -e 's|^C_SWITCH_SYSTEM *=.*$$|C_SWITCH_SYSTEM='"${C_SWITCH_SYSTEM}"'|' \
-         -e '/^# DIST: /d') > lib-src/Makefile.tmp
+          -e 's|^LOADLIBES *=.*$$|LOADLIBES='"${libsrc_libs}"'|'        \
+          -e '/^# DIST: /d') > lib-src/Makefile.tmp
        ${srcdir}/move-if-change lib-src/Makefile.tmp lib-src/Makefile
        chmod -w lib-src/Makefile
 src/Makefile: ${srcdir}/src/Makefile.in Makefile
-        echo "Producing \`src/Makefile' from \`${srcdir}/src/Makefile.in'."
        rm -f src/Makefile.tmp
-        (echo "# This file is generated from \`${srcdir}/src/Makefile.in'." ; \
+        @echo "Producing \`src/Makefile' from \`${srcdir}/src/Makefile.in'."
-         echo "# If you are thinking about editing it, you should seriously consider" ; \
+        @(echo "# This file is generated from \`${srcdir}/src/Makefile.in'." ; \
-         echo "# running \`make src/Makefile' at the top of the" ;      \
+          echo "# If you are thinking about editing it, you should seriously consider" ; \
-         echo "# Emacs build tree instead, or editing" ;                \
+          echo "# running \`make src/Makefile' at the top of the" ;     \
-         echo "# \`${srcdir}/src/Makefile.in' itself." ;                \
+          echo "# Emacs build tree instead, or editing" ;               \
-         /bin/sed < ${srcdir}/src/Makefile.in                           \
+          echo "# \`${srcdir}/src/Makefile.in' itself." ;               \
-         -e 's|^\(srcdir *=\).*$$|\1'"${srcdir}"'|'                     \
+          /bin/sed < ${srcdir}/src/Makefile.in                          \
-         -e 's|^CC *=.*$$|CC='"${CC}"'|'                                \
+          -e 's|^\(srcdir *=\).*$$|\1'"${srcdir}"'|'                    \
-         -e 's|^CONFIG_CFLAGS *=.*$$|CONFIG_CFLAGS='"${CONFIG_CFLAGS}"'|' \
+          -e 's|^CC *=.*$$|CC='"${CC}"'|'                               \
-         -e '/^# DIST: /d') > src/Makefile.tmp
+          -e 's|^CONFIG_CFLAGS *=.*$$|CONFIG_CFLAGS='"${CONFIG_CFLAGS}"'|' \
+          -e '/^# DIST: /d') > src/Makefile.tmp
        ${srcdir}/move-if-change src/Makefile.tmp src/Makefile
        chmod -w src/Makefile
author	Jim Blandy	1993-03-30 21:31:15 +0000
committer	Jim Blandy	1993-03-30 21:31:15 +0000
commit	7987a1696f3a80859f0396e54145dc525e5ea4bf (patch)
tree	c871fa479b49db5d6ac41688e2bf54e3ada3c9d7
parent	f298026408cb2c7216eeed489c01ad1f20858980 (diff)
download	emacs-7987a1696f3a80859f0396e54145dc525e5ea4bf.tar.gz emacs-7987a1696f3a80859f0396e54145dc525e5ea4bf.zip

diff --git a/Makefile.in b/Makefile.in index 2c752761380..f72d83454bc 100644 --- a/Makefile.in +++ b/Makefile.in
@@ -213,14 +213,15 @@ removenullpaths=sed -e 's/^://' -e 's/:$$//' -e 's/::/:/'
213	# src/paths.h.tmp, which isn't much.	213	# src/paths.h.tmp, which isn't much.
214	# Note that sed is not in /bin on 386bsd.	214	# Note that sed is not in /bin on 386bsd.
215	src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC	215	src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC
216	lisppath=`echo ${lisppath} \| ${removenullpaths}` ; \	216	@echo "Producing \`src/paths.h' from \`src/paths.h.in'."
217	buildlisppath=`echo ${buildlisppath} \| ${removenullpaths}` ; \	217	@(lisppath=`echo ${lisppath} \| ${removenullpaths}` ; \
218	sed < ${srcdir}/src/paths.h.in > src/paths.h.tmp \	218	buildlisppath=`echo ${buildlisppath} \| ${removenullpaths}` ; \
219	-e 's;\(#.PATH_LOADSEARCH\).$$;\1 "'$${lisppath}'";' \	219	sed < ${srcdir}/src/paths.h.in > src/paths.h.tmp \
220	-e 's;\(#.PATH_DUMPLOADSEARCH\).$$;\1 "'$${buildlisppath}'";' \	220	-e 's;\(#.PATH_LOADSEARCH\).$$;\1 "'$${lisppath}'";' \
221	-e 's;\(#.PATH_EXEC\).$$;\1 "${archlibdir}";' \	221	-e 's;\(#.PATH_DUMPLOADSEARCH\).$$;\1 "'$${buildlisppath}'";' \
222	-e 's;\(#.PATH_DATA\).$$;\1 "${etcdir}";' \	222	-e 's;\(#.PATH_EXEC\).$$;\1 "${archlibdir}";' \
223	-e 's;\(#.PATH_LOCK\).$$;\1 "${lockdir}/";'	223	-e 's;\(#.PATH_DATA\).$$;\1 "${etcdir}";' \
		224	-e 's;\(#.PATH_LOCK\).$$;\1 "${lockdir}/";')
224	${srcdir}/move-if-change src/paths.h.tmp src/paths.h	225	${srcdir}/move-if-change src/paths.h.tmp src/paths.h
225		226
226	src: lib-src	227	src: lib-src
@@ -237,42 +238,42 @@ ${SUBDIR}: ${SUBDIR_MAKEFILES} FRC
237	## when the user has built them from this makefile once, they will use	238	## when the user has built them from this makefile once, they will use
238	## the right default values for the path variables.	239	## the right default values for the path variables.
239	lib-src/Makefile: ${srcdir}/lib-src/Makefile.in Makefile	240	lib-src/Makefile: ${srcdir}/lib-src/Makefile.in Makefile
240	echo "Producing \`lib-src/Makefile' from \`${srcdir}/lib-src/Makefile.in'."
241	rm -f lib-src/Makefile.tmp	241	rm -f lib-src/Makefile.tmp
242	(echo "# This file is generated from \`${srcdir}/lib-src/Makefile.in'." ; \	242	@echo "Producing \`lib-src/Makefile' from \`${srcdir}/lib-src/Makefile.in'."
243	echo "# If you are thinking about editing it, you should seriously consider" ; \	243	@(echo "# This file is generated from \`${srcdir}/lib-src/Makefile.in'." ; \
244	echo "# running \`make lib-src/Makefile' at the top of the" ; \	244	echo "# If you are thinking about editing it, you should seriously consider" ; \
245	echo "# Emacs build tree instead, or editing" ; \	245	echo "# running \`make lib-src/Makefile' at the top of the" ; \
246	echo "# \`${srcdir}/lib-src/Makefile.in' itself." ; \	246	echo "# Emacs build tree instead, or editing" ; \
247	/bin/sed < ${srcdir}/lib-src/Makefile.in \	247	echo "# \`${srcdir}/lib-src/Makefile.in' itself." ; \
248	-e 's\|^\(version =\).$$\|\1'"${version}"'\|' \	248	/bin/sed < ${srcdir}/lib-src/Makefile.in \
249	-e 's\|^\(configname =\).$$\|\1'"${configname}"'\|' \	249	-e 's\|^\(version =\).$$\|\1'"${version}"'\|' \
250	-e 's\|^\(prefix =\).$$\|\1'"${prefix}"'\|' \	250	-e 's\|^\(configname =\).$$\|\1'"${configname}"'\|' \
251	-e 's\|^\(exec_prefix =\).$$\|\1'"${exec_prefix}"'\|' \	251	-e 's\|^\(prefix =\).$$\|\1'"${prefix}"'\|' \
252	-e 's\|^\(libdir =\).$$\|\1'"${libdir}"'\|' \	252	-e 's\|^\(exec_prefix =\).$$\|\1'"${exec_prefix}"'\|' \
253	-e 's\|^\(srcdir =\).$$\|\1'"${srcdir}"'\|' \	253	-e 's\|^\(libdir =\).$$\|\1'"${libdir}"'\|' \
254	-e 's\|^\(archlibdir =\).$$\|\1'"${archlibdir}"'\|' \	254	-e 's\|^\(srcdir =\).$$\|\1'"${srcdir}"'\|' \
255	-e 's\|^CC =.$$\|CC='"${CC}"'\|' \	255	-e 's\|^\(archlibdir =\).$$\|\1'"${archlibdir}"'\|' \
256	-e 's\|^CONFIG_CFLAGS =.$$\|CONFIG_CFLAGS='"${CONFIG_CFLAGS}"'\|' \	256	-e 's\|^CC =.$$\|CC='"${CC}"'\|' \
257	-e 's\|^C_SWITCH_SYSTEM =.$$\|C_SWITCH_SYSTEM='"${C_SWITCH_SYSTEM}"'\|' \	257	-e 's\|^CONFIG_CFLAGS =.$$\|CONFIG_CFLAGS='"${CONFIG_CFLAGS}"'\|' \
258	-e 's\|^LOADLIBES =.$$\|LOADLIBES='"${libsrc_libs}"'\|' \	258	-e 's\|^C_SWITCH_SYSTEM =.$$\|C_SWITCH_SYSTEM='"${C_SWITCH_SYSTEM}"'\|' \
259	-e '/^# DIST: /d') > lib-src/Makefile.tmp	259	-e 's\|^LOADLIBES =.$$\|LOADLIBES='"${libsrc_libs}"'\|' \
		260	-e '/^# DIST: /d') > lib-src/Makefile.tmp
260	${srcdir}/move-if-change lib-src/Makefile.tmp lib-src/Makefile	261	${srcdir}/move-if-change lib-src/Makefile.tmp lib-src/Makefile
261	chmod -w lib-src/Makefile	262	chmod -w lib-src/Makefile
262		263
263	src/Makefile: ${srcdir}/src/Makefile.in Makefile	264	src/Makefile: ${srcdir}/src/Makefile.in Makefile
264	echo "Producing \`src/Makefile' from \`${srcdir}/src/Makefile.in'."
265	rm -f src/Makefile.tmp	265	rm -f src/Makefile.tmp
266	(echo "# This file is generated from \`${srcdir}/src/Makefile.in'." ; \	266	@echo "Producing \`src/Makefile' from \`${srcdir}/src/Makefile.in'."
267	echo "# If you are thinking about editing it, you should seriously consider" ; \	267	@(echo "# This file is generated from \`${srcdir}/src/Makefile.in'." ; \
268	echo "# running \`make src/Makefile' at the top of the" ; \	268	echo "# If you are thinking about editing it, you should seriously consider" ; \
269	echo "# Emacs build tree instead, or editing" ; \	269	echo "# running \`make src/Makefile' at the top of the" ; \
270	echo "# \`${srcdir}/src/Makefile.in' itself." ; \	270	echo "# Emacs build tree instead, or editing" ; \
271	/bin/sed < ${srcdir}/src/Makefile.in \	271	echo "# \`${srcdir}/src/Makefile.in' itself." ; \
272	-e 's\|^\(srcdir =\).$$\|\1'"${srcdir}"'\|' \	272	/bin/sed < ${srcdir}/src/Makefile.in \
273	-e 's\|^CC =.$$\|CC='"${CC}"'\|' \	273	-e 's\|^\(srcdir =\).$$\|\1'"${srcdir}"'\|' \
274	-e 's\|^CONFIG_CFLAGS =.$$\|CONFIG_CFLAGS='"${CONFIG_CFLAGS}"'\|' \	274	-e 's\|^CC =.$$\|CC='"${CC}"'\|' \
275	-e '/^# DIST: /d') > src/Makefile.tmp	275	-e 's\|^CONFIG_CFLAGS =.$$\|CONFIG_CFLAGS='"${CONFIG_CFLAGS}"'\|' \
		276	-e '/^# DIST: /d') > src/Makefile.tmp
276	${srcdir}/move-if-change src/Makefile.tmp src/Makefile	277	${srcdir}/move-if-change src/Makefile.tmp src/Makefile
277	chmod -w src/Makefile	278	chmod -w src/Makefile
278		279