Commits

Anonymous committed 344c995

ALL xemacs-packages Makefiles to work for Native NT XEmacs <uya3t92gi.fsf@ecf.teradyne.com>

  • Participants
  • Parent commits f3ec10c

Comments (0)

Files changed (2)

+2000-06-25  AichnerAd  <aichner@ecf.teradyne.com>
+
+	* Makefile (EXTEND_LOAD_PATH): Handle Native-NT XEmacs
+	command-line quoting.
+	* Makefile (SGML_DATA_DIRECTORY): Ditto.
+	* Makefile (SGML_ECAT_FILES): Ditto.
+	* Makefile (SGML_CATALOG_FILES): Ditto.
+	* Makefile (PRELOADS): Use lisp instead of `pwd`.
+	* Makefile (etc/cdtd/html): Use EXTEND_LOAD_PATH,
+	SGML_DATA_DIRECTORY, SGML_ECAT_FILES, and SGML_CATALOG_FILES.
+
 2000-05-31  Andreas Jaeger  <aj@suse.de>
 
 	* Makefile (DATA_FILES): Add also etc/*.cl.
                $(wildcard etc/ISO_8879-1986/entities/*.ent)
 DATA_2_DEST = $(PACKAGE)/ISO_8879-1986/entities
 
-PRELOADS = -eval "(setq sgml-data-directory \"`pwd`/etc\")"
-
 include ../../XEmacs.rules
 
 GENERATED += custom-load.elc
 
+# APA: XEmacs native NT currently (2000-06-23) has shortcomings we
+# need to temporarily work around.
+ifeq ($(XEMACS_NATIVE_NT),t)
+# APA: XEmacs native NT currently needs this quoting of
+# command-line-rguments.
+EXTEND_LOAD_PATH = (push (expand-file-name \\\".\\\") load-path)
+SGML_DATA_DIRECTORY = (expand-file-name \\\"etc\\\")
+SGML_ECAT_FILES = (expand-file-name \\\"ECAT\\\" sgml-data-directory)
+SGML_CATALOG_FILES = (expand-file-name \\\"CATALOG\\\" sgml-data-directory)
+else
+EXTEND_LOAD_PATH = (push (expand-file-name \".\") load-path)
+SGML_DATA_DIRECTORY = (expand-file-name \"etc\")
+SGML_ECAT_FILES = (expand-file-name \"ECAT\" sgml-data-directory)
+SGML_CATALOG_FILES = (expand-file-name \"CATALOG\" sgml-data-directory)
+endif
+PRELOADS = -eval "(setq sgml-data-directory $(SGML_DATA_DIRECTORY))"
+
 # We should make a dependency on all files in etc/cdtd - but
 # how can this be done?  Nevertheless the following should work.
 etc/cdtd/html: etc/ECAT etc/CATALOG etc/*.dtd etc/*.ent $(DATA_2_FILES)
 	mkdir -p etc/cdtd
-	$(XEMACS) -batch -vanilla -eval "(push \"`pwd`\" load-path)" \
+	$(XEMACS) -batch -vanilla -eval "$(EXTEND_LOAD_PATH)" \
 	       -l psgml-parse \
                -eval "(setq sgml-auto-activate-dtd t  \
-			    sgml-data-directory \"`pwd`/etc\" \
-			    sgml-ecat-files (list (expand-file-name \"ECAT\" sgml-data-directory))  \
-			    sgml-catalog-files (list (expand-file-name \"CATALOG\" sgml-data-directory)))" \
+			    sgml-data-directory $(SGML_DATA_DIRECTORY) \
+			    sgml-ecat-files (list $(SGML_ECAT_FILES))  \
+			    sgml-catalog-files (list $(SGML_CATALOG_FILES)))" \
 	       -f sgml-compile-all-dtds
 
 all:: $(ELCS) auto-autoloads.elc custom-load.elc \