diff nt/xemacs.mak @ 327:03446687b7cc r21-0-61

Import from CVS: tag r21-0-61
author cvs
date Mon, 13 Aug 2007 10:48:16 +0200
parents f2b5d7006b0a
children 58bac07dfa74
line wrap: on
line diff
--- a/nt/xemacs.mak	Mon Aug 13 10:47:36 2007 +0200
+++ b/nt/xemacs.mak	Mon Aug 13 10:48:16 2007 +0200
@@ -65,11 +65,13 @@
 INSTALL_DIR=c:\Program Files\XEmacs\XEmacs-$(XEMACS_VERSION_STRING)
 ! endif
 !endif
-!if !defined(PACKAGEPATH)
-PATH_PACKAGEPATH="c:\\Program Files\\XEmacs\\packages"
-!else
-PATH_PACKAGEPATH="$(PACKAGEPATH)"
+!if !defined(PACKAGE_PATH)
+! if !defined(PACKAGE_PREFIX)
+PACKAGE_PREFIX=c:\Program Files\XEmacs
+! endif
+PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\mule-packages;$(PACKAGE_PREFIX)\xemacs-packages
 !endif
+PATH_PACKAGEPATH="$(PACKAGE_PATH:\=\\)"
 !if !defined(HAVE_MSW)
 HAVE_MSW=1
 !endif
@@ -222,7 +224,7 @@
 !message XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename) configured for "$(EMACS_CONFIGURATION)".
 !message 
 !message Installation directory is "$(INSTALL_DIR)".
-!message Package path is $(PATH_PACKAGEPATH).
+!message Package path is "$(PACKAGE_PATH)".
 !message 
 !if $(INFODOCK)
 !message Building InfoDock.
@@ -1010,9 +1012,10 @@
 # use this rule to install the system
 install:	all
 	@echo Installing in $(INSTALL_DIR) ...
+	@echo PlaceHolder > PlaceHolder
 	@xcopy /q PROBLEMS "$(INSTALL_DIR)\"
-	@xcopy /q README "$(INSTALL_DIR)\lock\"
-	@del "$(INSTALL_DIR)\lock\README"
+	@xcopy /q PlaceHolder "$(INSTALL_DIR)\lock\"
+	@del "$(INSTALL_DIR)\lock\PlaceHolder"
 	@xcopy /q $(LIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
 	@copy $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
 	@copy $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
@@ -1021,6 +1024,14 @@
 	@xcopy /e /q $(XEMACS)\etc  "$(INSTALL_DIR)\etc\"
 	@xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\"
 	@xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
+	@echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
+	@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
+	@del "$(PACKAGE_PREFIX)\site-packages\PlaceHolder"
+	@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\"
+	@del "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder"
+	@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
+	@del "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder"
+	@del PlaceHolder
 
 distclean:
 	del *.bak