User: adrian
Date: 06/05/01 12:07:54
Modified: packages ChangeLog XEmacs.rules
Log:
packages: XEmacs.rules fixes
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2006-05-01 Adrian Aichner <adrian(a)xemacs.org>
* 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.
Revision Changes Path
1.615 +9 -0 XEmacs/packages/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -p -r1.614 -r1.615
--- ChangeLog 2006/05/01 08:26:52 1.614
+++ ChangeLog 2006/05/01 10:07:53 1.615
@@ -1,3 +1,12 @@
+2006-05-01 Adrian Aichner <adrian(a)xemacs.org>
+
+ * 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.
+
2006-05-01 Norbert Koch <viteno(a)xemacs.org>
* Packages released: perl-modes.
1.57 +6 -3 XEmacs/packages/XEmacs.rules
Index: XEmacs.rules
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/XEmacs.rules,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- XEmacs.rules 2005/02/03 20:09:06 1.56
+++ XEmacs.rules 2006/05/01 10:07:53 1.57
@@ -297,7 +297,7 @@ FORMAT_MULE_INFO_USING_XEMACS = \
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 @@ PACKAGE_NET_PACKAGES = \
"$(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 @@ package-info : package-info.in Makefile
'$(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 @@ install-only: binkit
binkit: binkit-1
ifeq ($(INSTALL_HTML),t)
-binkit:: install-html
+binkit: install-html
endif
binkit-with-html: binkit-1 install-html
Show replies by date