aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-08-16 18:29:29 +0000
committerRichard M. Stallman1997-08-16 18:29:29 +0000
commit3163d9cfa1a78860db33261ff9338a40887f90c1 (patch)
tree26601874efa8043e2f6e7819c70b40fb78dacf95
parent734c9829fed2a81956aee57022331d600fa98076 (diff)
downloademacs-3163d9cfa1a78860db33261ff9338a40887f90c1.tar.gz
emacs-3163d9cfa1a78860db33261ff9338a40887f90c1.zip
(paths-force): Store PATH_X_DEFAULTS in paths.h.
-rw-r--r--Makefile.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 9c908044017..15c197cc342 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -113,6 +113,9 @@ srcdir=@srcdir@
113# Tell make where to find source files; this is needed for the makefiles. 113# Tell make where to find source files; this is needed for the makefiles.
114VPATH=@srcdir@ 114VPATH=@srcdir@
115 115
116# Where to find the application default.
117x_default_search_path=@x_default_search_path@
118
116# ==================== Emacs-specific directories ==================== 119# ==================== Emacs-specific directories ====================
117 120
118# These variables hold the values Emacs will actually use. They are 121# These variables hold the values Emacs will actually use. They are
@@ -204,6 +207,7 @@ removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
204paths-force: FRC 207paths-force: FRC
205 @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ 208 @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \
206 buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ 209 buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \
210 x_default_search_path=`echo ${x_default_search_path}`; \
207 sed < ${srcdir}/src/paths.in > paths.h.$$$$ \ 211 sed < ${srcdir}/src/paths.in > paths.h.$$$$ \
208 -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ 212 -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \
209 -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ 213 -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \
@@ -211,6 +215,7 @@ paths-force: FRC
211 -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ 215 -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \
212 -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ 216 -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \
213 -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ 217 -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \
218 -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
214 -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ 219 -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \
215 ${srcdir}/move-if-change paths.h.$$$$ src/paths.h 220 ${srcdir}/move-if-change paths.h.$$$$ src/paths.h
216 221