comparison Makefile.in @ 269:b2472a1930f2 r20-5b33

Import from CVS: tag r20-5b33
author cvs
date Mon, 13 Aug 2007 10:27:19 +0200
parents 966663fcf606
children c5d627a313b1
comparison
equal deleted inserted replaced
268:6ced69ccd85f 269:b2472a1930f2
151 ## This is set to 'yes' if the user specified the --lispdir or 151 ## This is set to 'yes' if the user specified the --lispdir or
152 ## --datadir flag at configuration time. 152 ## --datadir flag at configuration time.
153 lispdir_user_defined=@lispdir_user_defined@ 153 lispdir_user_defined=@lispdir_user_defined@
154 154
155 ## Where packages are found. 155 ## Where packages are found.
156 packagepath=@packagepath@ 156 package_path=@package_path@
157 157
158 ## This is set to 'yes' if the user specified the --package_path 158 ## This is set to 'yes' if the user specified the --package_path
159 ## at configuration time. 159 ## at configuration time.
160 packagepath_user_defined=@packagepath_user_defined@ 160 package_path_user_defined=@package_path_user_defined@
161 161
162 162
163 ## Directory XEmacs should search for lisp files specific 163 ## Directory XEmacs should search for lisp files specific
164 ## to this site (i.e. customizations), before consulting 164 ## to this site (i.e. customizations), before consulting
165 ## ${lispdir}. 165 ## ${lispdir}.
309 @(echo '#define PATH_PREFIX "${prefix}"'; \ 309 @(echo '#define PATH_PREFIX "${prefix}"'; \
310 if test "${lispdir_user_defined}" = "yes"; \ 310 if test "${lispdir_user_defined}" = "yes"; \
311 then echo '#define PATH_LOADSEARCH "${lispdir}"'; \ 311 then echo '#define PATH_LOADSEARCH "${lispdir}"'; \
312 else echo '/* #define PATH_LOADSEARCH "${lispdir}" */'; \ 312 else echo '/* #define PATH_LOADSEARCH "${lispdir}" */'; \
313 fi; \ 313 fi; \
314 if test "${packagepath_user_defined}" = "yes"; \ 314 if test "${package_path_user_defined}" = "yes"; \
315 then echo '#define PATH_PACKAGEPATH "${packagepath}"'; \ 315 then echo '#define PATH_PACKAGEPATH "${package_path}"'; \
316 else echo '/* #define PATH_PACKAGEPATH "${packagepath}" */'; \ 316 else echo '/* #define PATH_PACKAGEPATH "${package_path}" */'; \
317 fi; \ 317 fi; \
318 if test "${sitelispdir_user_defined}" = "yes"; \ 318 if test "${sitelispdir_user_defined}" = "yes"; \
319 then echo '#define PATH_SITE "${sitelispdir}"'; \ 319 then echo '#define PATH_SITE "${sitelispdir}"'; \
320 else echo '/* #define PATH_SITE "${sitelispdir}" */'; \ 320 else echo '/* #define PATH_SITE "${sitelispdir}" */'; \
321 fi; \ 321 fi; \
333 fi; \ 333 fi; \
334 if test "${infodir_user_defined}" = "yes"; \ 334 if test "${infodir_user_defined}" = "yes"; \
335 then echo '#define PATH_INFO "${infodir}"'; \ 335 then echo '#define PATH_INFO "${infodir}"'; \
336 else echo '/* #define PATH_INFO "${infodir}" */'; \ 336 else echo '/* #define PATH_INFO "${infodir}" */'; \
337 fi; \ 337 fi; \
338 if test "${infopath_user_defined}" = "yes"; \ 338 echo '#define PATH_INFOPATH "${infopath}"'; \
339 then echo '#define PATH_INFOPATH "${infopath}"'; \ 339 ) >> src/paths.h.tmp; \
340 else echo '/* #define PATH_INFOPATH "${infopath}" */'; \
341 fi; ) >> src/paths.h.tmp; \
342 sh ${srcdir}/move-if-change src/paths.h.tmp src/paths.h 340 sh ${srcdir}/move-if-change src/paths.h.tmp src/paths.h
343 341
344 ## We have to force the building of Emacs.ad.h as well in order to get it 342 ## We have to force the building of Emacs.ad.h as well in order to get it
345 ## updated correctly when VPATH is being used. Since we use move-if-change, 343 ## updated correctly when VPATH is being used. Since we use move-if-change,
346 ## it will only actually change if the user modified ${etcdir}/Emacs.ad. 344 ## it will only actually change if the user modified ${etcdir}/Emacs.ad.