There's confusion between configure's `progname' and the `progname' used by the Makefiles. This patch makes everything consistent. After applying this patch, the generated src/paths.h looks cleaner anyway. ChangeLog: 1998-04-29 SL Baur <steve(a)altair.xemacs.org&gt; * configure.in: Use `PROGNAME' for all generated paths. * Makefile.in: Change `progname' to `PROGNAME' for consistency. src/ChangeLog: 1998-04-29 SL Baur <steve(a)altair.xemacs.org&gt; * Makefile.in.in: Change `progname' to `PROGNAME' for consistency. Index: configure.in =================================================================== RCS file: /usr/local/xemacs/xemacs-20.0/configure.in,v retrieving revision 1.96 diff -u -r1.96 configure.in --- configure.in 1998/04/28 00:24:40 1.96 +++ configure.in 1998/04/29 23:42:20 ＠＠ -325,16 +325,16 ＠＠ statedir='${prefix}/lib' libdir='${exec_prefix}/lib' mandir='${prefix}/man/man1' -infodir='${datadir}/${progname}-${version}/info' +infodir='${datadir}/${PROGNAME}-${version}/info' infopath='' install_pp='' -lispdir='${datadir}/${progname}-${version}/lisp' +lispdir='${datadir}/${PROGNAME}-${version}/lisp' dnl sitelispdir='${datadir}/xemacs/site-lisp' -pkgdir='${datadir}/${progname}-${version}/lisp' +pkgdir='${datadir}/${PROGNAME}-${version}/lisp' package_path='' -etcdir='${datadir}/${progname}-${version}/etc' -lockdir='${statedir}/${progname}/lock' -archlibdir='${libdir}/${progname}-${version}/${configuration}' +etcdir='${datadir}/${PROGNAME}-${version}/etc' +lockdir='${statedir}/${PROGNAME}/lock' +archlibdir='${libdir}/${PROGNAME}-${version}/${configuration}' with_site_lisp='no' with_menubars='' with_scrollbars='' Index: Makefile.in =================================================================== RCS file: /usr/local/xemacs/xemacs-20.0/Makefile.in,v retrieving revision 1.56 diff -u -r1.56 Makefile.in --- Makefile.in 1998/04/28 00:24:33 1.56 +++ Makefile.in 1998/04/29 23:40:00 ＠＠ -75,6 +75,10 ＠＠ ## for, like `mips-dec-ultrix' or `sparc-sun-sunos'. configuration=＠configuration＠ +## This will be the name of the generated binary and is set automatically +## by configure. +PROGNAME=＠PROGNAME＠ + ## ==================== Where To Install Things ==================== ## The default location for installation. Everything is placed in ＠＠ -136,8 +140,6 ＠＠ ## These variables hold the values XEmacs will actually use. They are ## based on the values of the standard Make variables above. -progname=＠PROGNAME＠ - ## Where to install the lisp files distributed with ## XEmacs. This includes the XEmacs version, so that the ## lisp files for different versions of XEmacs will install ＠＠ -212,9 +214,9 ＠＠ GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/puresize-adjust.h src/config.h lwlib/config.h src/sheap-adjust.h GENERATED_LISP = lisp/finder-inf.el -all: ${progname} all-elc info +all: ${PROGNAME} all-elc info -${progname}: ${GENERATED_HEADERS} ${MAKE_SUBDIR} ${GENERATED_LISP} +${PROGNAME}: ${GENERATED_HEADERS} ${MAKE_SUBDIR} ${GENERATED_LISP} ## For performance and consistency, no built-in rules .SUFFIXES: ＠＠ -250,22 +252,22 ＠＠ ## Build XEmacs and recompile out-of-date and missing .elc files along ## the way. all-elc all-elcs: lib-src lwlib dump-elcs src - MAKE='$(MAKE)' EMACS='./src/$(progname)' sh ${srcdir}/lib-src/update-elc.sh + MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-elc.sh ## Sub-target for all-elc. dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs cd src && $(RECURSIVE_MAKE) dump-elcs autoloads: src - MAKE='$(MAKE)' EMACS='./src/$(progname)' sh ${srcdir}/lib-src/update-autoloads.sh + MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-autoloads.sh custom-loads: - MAKE='$(MAKE)' EMACS='./src/$(progname)' sh ${srcdir}/lib-src/update-custom.sh + MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' sh ${srcdir}/lib-src/update-custom.sh finder: src ＠echo "Building finder database ..." ＠(cd lisp; \ - ${blddir}/src/${progname} -batch -vanilla \ + ${blddir}/src/${PROGNAME} -batch -vanilla \ -eval '(setq finder-compile-keywords-quiet t)' \ -l finder -f finder-compile-keywords ) ＠echo "Building finder database ...(done)" ＠＠ -273,7 +275,7 ＠＠ lisp/finder-inf.el: ＠echo "Building finder database ..." ＠(cd lisp; \ - ${blddir}/src/${progname} -batch -vanilla \ + ${blddir}/src/${PROGNAME} -batch -vanilla \ -eval '(setq finder-compile-keywords-quiet t)' \ -l finder -f finder-compile-keywords ) ＠echo "Building finder database ...(done)" ＠＠ -364,7 +366,7 ＠＠ ## all. --cet check-features: all - ${blddir}/src/${progname} -batch -l check-features.el + ${blddir}/src/${PROGNAME} -batch -l check-features.el install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep ＠＠ -385,15 +387,15 ＠＠ for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \ do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ else true; fi - ${INSTALL_PROGRAM} src/${progname} ${bindir}/${progname}-${version} - -chmod 0755 ${bindir}/${progname}-${version} - cd ${bindir} && $(RM) ./${progname} && ${LN_S} ${progname}-${version} ./${progname} + ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version} + -chmod 0755 ${bindir}/${PROGNAME}-${version} + cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} if test "${prefix}" != "${exec_prefix}"; then \ for dir in \ - lib/${progname} \ - lib/${progname}-${version}/etc \ - lib/${progname}-${version}/info \ - lib/${progname}-${version}/lisp; do \ + lib/${PROGNAME} \ + lib/${PROGNAME}-${version}/etc \ + lib/${PROGNAME}-${version}/info \ + lib/${PROGNAME}-${version}/lisp; do \ if test ! -d ${exec_prefix}/$${dir}; then \ $(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \ done; \ ＠＠ -432,7 +434,7 ＠＠ chmod 0644 ${infodir}/$${file}; \ done ; \ fi - ## Note it's `xemacs' not ${progname} + ## Note it's `xemacs' not ${PROGNAME} cd ${srcdir}/etc && \ for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ ＠＠ -451,7 +453,7 ＠＠ MAKEPATH=./lib-src/make-path ## Build all the directories to install XEmacs in. ## Since we may be creating several layers of directories, -## (e.g. /usr/local/lib/${progname}-20.5/sparc-sun-solaris2.6), we use +## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use ## make-path instead of mkdir. Not all mkdirs have the `-p' flag. mkdir: FRC.mkdir ${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \ ＠＠ -476,14 +478,14 ＠＠ # * ) $(RM) $${dir} ;; \ # esac ; \ # case $${dir} in \ -# ${datadir}/${progname}/${version}/* ) \ -# $(RM) -r ${datadir}/${progname}/${version} \ +# ${datadir}/${PROGNAME}/${version}/* ) \ +# $(RM) -r ${datadir}/${PROGNAME}/${version} \ # ;; \ # esac ; \ # done -# cd ${infodir} && $(RM) cl* ${progname}* forms* info* vip* +# cd ${infodir} && $(RM) cl* ${PROGNAME}* forms* info* vip* # cd ${mandir} && $(RM) xemacs.1 etags.1 ctags.1 gnuserv.1 -# cd ${bindir} && $(RM) ${progname}-${version} ${progname} +# cd ${bindir} && $(RM) ${PROGNAME}-${version} ${PROGNAME} ## Some makes seem to remember that they've built something called FRC, ＠＠ -606,7 +608,7 ＠＠ tests = ${testdir}/basic-lisp.el ${testdir}/database.el check: - src/${progname} -batch -l ${testdir}/test-emacs.el -f batch-test-emacs ${tests} + src/${PROGNAME} -batch -l ${testdir}/test-emacs.el -f batch-test-emacs ${tests} info: FRC.info cd ${srcdir}/man && $(RECURSIVE_MAKE) $＠ ＠＠ -618,6 +620,6 ＠＠ mcs: date=`LANG=C LC_ALL=C date -u '+%e %b %Y'`; \ ident="＠(#)RELEASE VERSION XEmacs ${version} $${date}"; \ - for f in `file lib-src/* src/${progname} | grep ELF | sed -e 's/:.*//'`; do \ + for f in `file lib-src/* src/${PROGNAME} | grep ELF | sed -e 's/:.*//'`; do \ mcs -da "$${ident} `echo $${f} | sed 's/.*\///'`" $${f}; \ done Index: src/Makefile.in.in =================================================================== RCS file: /usr/local/xemacs/xemacs-20.0/src/Makefile.in.in,v retrieving revision 1.76 diff -u -r1.76 Makefile.in.in --- src/Makefile.in.in 1998/04/28 00:24:50 1.76 +++ src/Makefile.in.in 1998/04/29 23:40:51 ＠＠ -22,9 +22,9 ＠＠ ## Synched up with: Not synched with FSF. -progname=＠PROGNAME＠ +PROGNAME=＠PROGNAME＠ -all: ${progname} +all: ${PROGNAME} .PHONY : all release dump-elc dump-elcs all-elc all-elcs lint ## For performance and consistency, no built-in rules. ＠＠ -290,7 +290,7 ＠＠ release: temacs ${libsrc}DOC $(mo_file) ${other_files} #ifdef CANNOT_DUMP - ln temacs ${progname} + ln temacs ${PROGNAME} #else #ifdef HAVE_SHM -if [ -w ${srcdir}/../lisp ]; then \ ＠＠ -312,21 +312,21 ＠＠ touch release #endif /* ! defined (CANNOT_DUMP) */ -${progname}: temacs ${libsrc}DOC $(mo_file) ${other_files} update-elc.stamp +${PROGNAME}: temacs ${libsrc}DOC $(mo_file) ${other_files} update-elc.stamp ＠$(RM) $＠ && touch SATISFIED -$(DUMPENV) ./temacs -batch -l ${srcdir}/../lisp/loadup.el dump ＠if test -f $＠; then if test -f SATISFIED; then \ echo "Testing for Lisp shadows ..."; \ - ./${progname} -batch -vanilla -f list-load-path-shadows; fi; \ + ./${PROGNAME} -batch -vanilla -f list-load-path-shadows; fi; \ $(RM) SATISFIED; exit 0; fi; \ if test -f SATISFIED; then $(RM) SATISFIED; exit 1; fi; \ $(RECURSIVE_MAKE) $＠; fastdump: temacs - ＠$(RM) ${progname} && touch SATISFIED + ＠$(RM) ${PROGNAME} && touch SATISFIED -$(DUMPENV) ./temacs -batch -l ${srcdir}/../lisp/loadup.el dump - ＠if test -f ${progname}; then if test -f SATISFIED; then \ - ./${progname} -batch -vanilla -f list-load-path-shadows; fi; \ + ＠if test -f ${PROGNAME}; then if test -f SATISFIED; then \ + ./${PROGNAME} -batch -vanilla -f list-load-path-shadows; fi; \ $(RM) SATISFIED; exit 0; fi; \ if test -f SATISFIED; then $(RM) SATISFIED; exit 1; fi; ＠＠ -661,10 +661,10 ＠＠ ## Do not use it on development directories! distclean: clean $(RM) config.h paths.h Emacs.ad.h \ - Makefile Makefile.in TAGS ${progname}.* + Makefile Makefile.in TAGS ${PROGNAME}.* realclean: distclean versionclean: - $(RM) ${progname} ${progname}.exe ${libsrc}DOC + $(RM) ${PROGNAME} ${PROGNAME}.exe ${libsrc}DOC extraclean: realclean $(RM) *~ \#* m/*~ m/\#* s/*~ s/\#*