User: vins Date: 06/03/18 20:26:33 Branch: xemacs/nt release-21-4 Modified: xemacs/nt ChangeLog xemacs.mak config.inc.samp Log: There is no default package path. Allow the package path to be found at runtime. Revision Changes Path 1.89.2.44 +6 -0 XEmacs/xemacs/nt/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.89.2.43 retrieving revision 1.89.2.44 diff -u -p -r1.89.2.43 -r1.89.2.44 --- ChangeLog 2006/01/31 23:53:47 1.89.2.43 +++ ChangeLog 2006/03/18 19:26:31 1.89.2.44 ＠＠ -1,3 +1,9 ＠＠ +2006-03-04 Vin Shelton <acs(a)xemacs.org&gt; + + * config.inc.samp: Comment out PACKAGE_PREFIX. + * xemacs.mak: Do not set a value for PACKAGE_PATH unless + PACKAGE_PATH or PACKAGE_PREFIX was specified in config.inc. + 2006-01-28 Vin Shelton <acs(a)xemacs.org&gt; * XEmacs.iss: Erase old code. 1.58.2.13 +35 -8 XEmacs/xemacs/nt/xemacs.mak Index: xemacs.mak =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v retrieving revision 1.58.2.12 retrieving revision 1.58.2.13 diff -u -p -r1.58.2.12 -r1.58.2.13 --- xemacs.mak 2005/01/31 02:54:56 1.58.2.12 +++ xemacs.mak 2006/03/18 19:26:32 1.58.2.13 ＠＠ -108,17 +108,24 ＠＠ INSTALL_DIR=c:\Program Files\XEmacs\XEma !if !defined(HAVE_MULE) HAVE_MULE=0 !endif + +# If PACKAGE_PATH was defined, use it. If PACKAGE_PATH was not defined, +# but PACKAGE_PREFIX was, use PACKAGE_PREFIX to generate a package path. +# If neither PACKAGE_PATH nor PACKAGE_PREFIX was defined, +# do not define a package path. !if !defined(PACKAGE_PATH) -! if !defined(PACKAGE_PREFIX) -PACKAGE_PREFIX=c:\Program Files\XEmacs -! endif -! if $(HAVE_MULE) +! if defined(PACKAGE_PREFIX) +! if $(HAVE_MULE) PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\mule-packages;$(PACKAGE_PREFIX)\xemacs-packages -! else +! else PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\xemacs-packages +! endif ! endif !endif +!if defined(PACKAGE_PATH) PATH_PACKAGEPATH="$(PACKAGE_PATH:\=\\)" +!endif + !if !defined(HAVE_MS_WINDOWS) HAVE_MS_WINDOWS=1 !endif ＠＠ -541,8 +548,10 ＠＠ CONFIG_VALUES = $(LIB_SRC)\config.values !endif !if [echo LISPDIR>>$(CONFIG_VALUES) && echo "$(MAKEDIR:\=\\)\\$(LISP:\=\\)">>$(CONFIG_VALUES)] !endif +!if defined(PATH_PACKAGEPATH) # PATH_PACKAGEPATH is already a quoted string. -!if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)] +! if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)] +! endif !endif # Inferred rule ＠＠ -875,8 +884,10 ＠＠ TEMACS_CPP_FLAGS=-c \ $(EMACS_BETA_VERSION) \ $(EMACS_PATCH_LEVEL) \ -DXEMACS_CODENAME=\"$(xemacs_codename:&=and)\" \ - -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \ - -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" +!if defined(PATH_PACKAGEPATH) + -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" \ +!endif + -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" !if $(HAVE_X_WINDOWS) TEMACS_X_OBJS=\ ＠＠ -1363,7 +1374,11 ＠＠ docfile :: $(DOC) $(DOC): $(LIB_SRC)\make-docfile.exe $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(DOC_SRC10) $(DOC_SRC11) if exist $(DOC) del $(DOC) +!if defined(PACKAGE_PATH) set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH) +!else + set EMACSBOOTSTRAPLOADPATH=$(LISP) +!endif set EMACSBOOTSTRAPMODULEPATH=$(MODULES) $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1) ＠＠ -1379,7 +1394,11 ＠＠ $(DOC): $(LIB_SRC)\make-docfile.exe $(DO $(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC11) update-elc: +!if defined(PACKAGE_PATH) set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH) +!else + set EMACSBOOTSTRAPLOADPATH=$(LISP) +!endif set EMACSBOOTSTRAPMODULEPATH=$(MODULES) $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\update-elc.el ＠＠ -1393,7 +1412,11 ＠＠ $(TEMACS_DIR)\NEEDTODUMP : $(PROGNAME) : $(TEMACS) $(TEMACS_DIR)\NEEDTODUMP ＠echo >$(TEMACS_DIR)\SATISFIED cd $(TEMACS_DIR) +!if defined(PACKAGE_PATH) set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH) +!else + set EMACSBOOTSTRAPLOADPATH=$(LISP) +!endif set EMACSBOOTSTRAPMODULEPATH=$(MODULES) $(TEMACS_BATCH) -l $(TEMACS_DIR)\..\lisp\loadup.el dump !if $(USE_PORTABLE_DUMPER) ＠＠ -1435,6 +1458,7 ＠＠ install: all ＠xcopy /e /q $(XEMACS)\etc "$(INSTALL_DIR)\etc\" ＠xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\" ＠xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\" +!if defined(PACKAGE_PREFIX) ＠echo Making skeleton package tree in $(PACKAGE_PREFIX) ... ＠xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\" $(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder" ＠＠ -1442,6 +1466,7 ＠＠ install: all $(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder" ＠xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\" $(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder" +!endif $(DEL) PlaceHolder mostlyclean: ＠＠ -1525,7 +1550,9 ＠＠ XEmacs $(XEMACS_VERSION_STRING) $(xemacs Using compiler "$(CC) $(CFLAGS)". !endif Installing XEmacs in "$(INSTALL_DIR:\=\\)". +!if defined(PATH_PACKAGEPATH) Package path is $(PATH_PACKAGEPATH). +!endif !if $(INFODOCK) Building InfoDock. !endif 1.2.2.5 +2 -1 XEmacs/xemacs/nt/config.inc.samp Index: config.inc.samp =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/config.inc.samp,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -u -p -r1.2.2.4 -r1.2.2.5 --- config.inc.samp 2005/01/31 02:54:55 1.2.2.4 +++ config.inc.samp 2006/03/18 19:26:32 1.2.2.5 ＠＠ -4,7 +4,8 ＠＠ INSTALL_DIR=c:\Program Files\XEmacs\XEmacs-$(XEMACS_VERSION_STRING) -PACKAGE_PREFIX=c:\Program Files\XEmacs +# Set this if your packages are installed in an unusal place. +#PACKAGE_PREFIX=c:\Program Files\XEmacs ############################################################################