Revision: 2729
http://gar.svn.sourceforge.net/gar/?rev=2729&view=rev
Author: bdwalton
Date: 2009-01-01 18:52:31 +0000 (Thu, 01 Jan 2009)
Log Message:
-----------
- Clean up path names of install directories (remove patch level)
- Override PATH so that my lightly modified checkpkg is used during the
packaging step (allow docbookxsldoc to depend on docbookxsl even though
it's not installed yet).
Modified Paths:
--------------
csw/mgar/pkg/docbook-style-xsl/trunk/Makefile
csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
Modified: csw/mgar/pkg/docbook-style-xsl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2009-01-01 16:54:52 UTC
(rev 2728)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/Makefile 2009-01-01 18:52:31 UTC
(rev 2729)
@@ -20,6 +20,9 @@
Microsoft HTML Help, and man pages.
endef
+SPKG_DESC_CSWdocbookxsl = Norman Walsh's XSL stylesheets for DocBook XML
+SPKG_DESC_CSWdocbookxsldoc = Documentation for the Docbook XSL stylesheets
+
# docbook-xsl is housed in the docbook master project at SF.
SF_PROJ = docbook
MASTER_SITES = $(SF_MIRRORS)
@@ -40,16 +43,18 @@
TEST_SCRIPTS =
-INSTALL_ARGS = DESTDIR=$(DESTDIR) GARVERSION=$(GARVERSION) \
- PATCHLEVEL=$(PATCHLEVEL)
+INSTALL_ARGS = DESTDIR=$(DESTDIR) GARVERSION=$(GARVERSION)
+
#to make the package extraction happy...(we don't use the - separator)
WORKSRC = $(WORKDIR)/docbook-xsl-$(GARVERSION)
post-install-modulated:
@(cd $(DESTDIR)/opt/csw/share/sgml/docbook; \
- ln -s xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL) \
- xsl-stylesheets )
+ ln -s xsl-stylesheets-$(GARVERSION) xsl-stylesheets )
@$(MAKECOOKIE)
include gar/category.mk
+
+#override system checkpkg so that docbookxsldoc can depend on docbookxsl
+PATH := /home/bwalton:$(PATH)
Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
2009-01-01 16:54:52 UTC (rev 2728)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
2009-01-01 18:52:31 UTC (rev 2729)
@@ -1,10 +1,9 @@
--- /dev/null 2008-12-14 03:06:26.000000000 +0100
+++ docbook-xsl-1.69.1/Makefile 2008-12-14 04:12:33.444192066 +0100
-@@ -0,0 +1,51 @@
+@@ -0,0 +1,50 @@
+
+DESTDIR ?= ... should be overridden by GAR ...
+GARVERSION ?= ... should be overridden by GAR ...
-+PATCHLEVEL ?= ... should be overridden by GAR ...
+
+SHELL = /opt/csw/bin/bash
+
@@ -12,8 +11,8 @@
+bindir = $(prefix)/bin
+datadir = $(prefix)/share
+
-+instdir = $(datadir)/sgml/docbook/xsl-stylesheets-$(GARVERSION)-$(PATCHLEVEL)
-+docdir = $(datadir)/doc/docbookxsl-$(GARVERSION)-$(PATCHLEVEL)
++instdir = $(datadir)/sgml/docbook/xsl-stylesheets-$(GARVERSION)
++docdir = $(datadir)/doc/docbookxsl-$(GARVERSION)
+
+all: install
+
@@ -52,4 +51,4 @@
+ gmkdir -p $(docdir)
+ cp BUGS ChangeLog README TODO $(docdir)/
+ cp -R doc $(docdir)/
-\ No newline at end of file
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
