COMMIT This allows me building of Ville's unsupported/scop/vc package. Norbert, please let me know if you have issues with me using commit-and-review on this one. Best regards! Adrian packages ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v retrieving revision 1.614 diff -u -U0 -r1.614 ChangeLog --- ChangeLog 1 May 2006 08:26:52 -0000 1.614 +++ ChangeLog 1 May 2006 10:04:41 -0000 ＠＠ -0,0 +1,9 ＠＠ +2006-05-01 Adrian Aichner <adrian(a)xemacs.org&gt; + + * XEmacs.rules (FORMAT_INFO): Drop use of -o argument. + * XEmacs.rules (HACK_PACKAGE_INDEX): New variable supporting + "unsupported" packages, which are on different relative + subdirectory level from official packages. + * XEmacs.rules (package-info): Use $(HACK_PACKAGE_INDEX). + * XEmacs.rules (binkit): Convert to single-colon rule. + packages source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: XEmacs.rules Index: XEmacs.rules =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/XEmacs.rules,v retrieving revision 1.56 diff -u -w -r1.56 XEmacs.rules --- XEmacs.rules 3 Feb 2005 20:09:06 -0000 1.56 +++ XEmacs.rules 1 May 2006 09:55:52 -0000 ＠＠ -297,7 +297,7 ＠＠ ifeq ($(COMPILE_INFO_AS_MULE),t) FORMAT_INFO = $(FORMAT_MULE_INFO_USING_XEMACS) else -FORMAT_INFO = cd $(＠D) && $(MAKEINFO) $(MAKEINFO_FLAGS) -o $(＠F) $(<F) +FORMAT_INFO = cd $(＠D) && $(MAKEINFO) $(MAKEINFO_FLAGS) $(<F) endif %-ja.info: %-ja.texi ＠＠ -373,11 +373,14 ＠＠ "$(shell cygpath --windows $(XEMACS_PACKAGES_BASE)/package-net-packages.el)" PACKAGE_STAGING = \ "$(shell cygpath --windows $(STAGING))" +HACK_PACKAGE_INDEX = \ +"$(shell cygpath --windows $(XEMACS_PACKAGES_BASE)/hack-package-index.el)" else PACKAGE_COMPILE = $(XEMACS_PACKAGES_BASE)/package-compile.el PACKAGE_CLEAN = $(XEMACS_PACKAGES_BASE)/package-clean.el PACKAGE_NET_PACKAGES = $(XEMACS_PACKAGES_BASE)/package-net-packages.el PACKAGE_STAGING = $(STAGING) +HACK_PACKAGE_INDEX = $(XEMACS_PACKAGES_BASE)/hack-package-index.el endif # Behaves like an XEmacs with the required packages set up ＠＠ -519,7 +522,7 ＠＠ '$(AUTHOR_VERSION)' '$(MAINTAINER)' '$(CATEGORY)' # #### See if we can't CLEAN this up $(XEMACS_BATCH_DIRTY) \ - -l ../../hack-package-index.el -f batch-hack-package-index \ + -l $(HACK_PACKAGE_INDEX) -f batch-hack-package-index \ $(PACKAGE) package-info $(PACKAGE_INFO) $(CATEGORY) ifeq ($(BUILD_TARS),t) ＠＠ -589,7 +592,7 ＠＠ binkit: binkit-1 ifeq ($(INSTALL_HTML),t) -binkit:: install-html +binkit: install-html endif binkit-with-html: binkit-1 install-html -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/