[csw-devel] SF.net SVN: gar:[4295] csw/mgar/pkg/docbook-style-xsl/trunk

[bdwalton at users.sourceforge.net]

Revision: 4295
          http://gar.svn.sourceforge.net/gar/?rev=4295&view=rev
Author:   bdwalton
Date:     2009-04-13 17:58:14 +0000 (Mon, 13 Apr 2009)

Log Message:
-----------
rework local makefile to be more generic

Modified Paths:
--------------
    csw/mgar/pkg/docbook-style-xsl/trunk/checksums
    csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/checksums
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/checksums	2009-04-13 14:53:03 UTC (rev 4294)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/checksums	2009-04-13 17:58:14 UTC (rev 4295)
@@ -1,4 +1,4 @@
 1b98827c1a02fcec57ec0f7376bb8815  download/CSWdocbookxsl.preremove
-9ba4d6409de31404b8022f10630016e0  download/add_makefile.patch
+a92b47305b3499396aafda83e4bbfefb  download/add_makefile.patch
 c77c0c317040b2f2e366842bd9df2218  download/docbook-xsl-1.74.3.tar.bz2
 2a032a95fbf24367d13acc8210f9cd72  download/docbook-xsl-doc-1.74.3.tar.bz2

Modified: csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch
===================================================================
--- csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch	2009-04-13 14:53:03 UTC (rev 4294)
+++ csw/mgar/pkg/docbook-style-xsl/trunk/files/add_makefile.patch	2009-04-13 17:58:14 UTC (rev 4295)
@@ -1,10 +1,17 @@
---- /dev/null	2009-04-10 02:03:32.000000000 +0200
-+++ docbook-xsl-1.74.3/Makefile.csw	2009-04-10 04:25:32.872750482 +0200
-@@ -0,0 +1,46 @@
+--- /dev/null	2009-04-13 19:20:44.000000000 +0200
++++ docbook-xsl-1.74.3/Makefile.csw	2009-04-13 19:24:36.996214871 +0200
+@@ -0,0 +1,43 @@
 +DESTDIR ?= ... should be overridden by GAR ...
 +
 +SHELL = /opt/csw/bin/bash
 +
++# directories that don't get installed by the generic install-xsl target
++# note the . (to work around find output)
++SS_EX_DIRS = doc docsrc tools tests .
++# directories that do get installed by install-xsl
++DIRS = $(subst ./,,$(shell gfind . -maxdepth 1 -type d))
++SS_DIRS  = $(foreach D,$(filter-out $(SS_EX_DIRS),$(DIRS)),dir-$(D))
++
 +prefix = $(DESTDIR)/opt/csw
 +bindir = $(prefix)/bin
 +datadir = $(prefix)/share
@@ -14,33 +21,23 @@
 +
 +all: install
 +
-+install: install-xsl install-img install-misc install-docs
++install: install-xsl install-misc install-docs
 +
-+install-xsl:
-+	gmkdir -p $(instdir)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling}
-+	cp common/*.dtd $(instdir)/common
-+	cp common/*.xml $(instdir)/common
-+	cp common/*.xsl $(instdir)/common
-+	cp fo/*.xml $(instdir)/fo
-+	cp fo/*.xsl $(instdir)/fo
-+	cp html/*.xml $(instdir)/html
-+	cp html/*.xsl $(instdir)/html
-+	cp htmlhelp/*.xsl $(instdir)/htmlhelp
-+	cp javahelp/*.xsl $(instdir)/javahelp
-+	cp lib/lib.xsl $(instdir)/lib
-+	cp template/*.xml $(instdir)/template
-+	cp template/*.xsl $(instdir)/template
-+	cp xhtml/*.xsl $(instdir)/xhtml
-+	cp manpages/*.xsl $(instdir)/manpages
-+	cp profiling/*.xsl $(instdir)/profiling
++$(instdir):
++	gmkdir -p $(instdir)
 +
-+install-img:
-+	gmkdir -p $(instdir)/images/callouts
-+	cp images/*.gif $(instdir)/images
-+	cp images/*.png $(instdir)/images
-+	cp images/callouts/*.png $(instdir)/images/callouts
++#so we don't get the example bin files, etc.  we can always install them
++# 'properly' to csw/bin/ if there is demand.
++dir-epub: $(instdir)
++	gmkdir -p $(instdir)/epub
++	cp epub/*xsl $(instdir)/epub
 +
-+install-misc:
++dir-%:
++	cp -R $*/ $(instdir)/
++
++install-xsl: $(instdir) $(SS_DIRS)
++
++install-misc: $(instdir)
 +	cp VERSION $(instdir)
 +
 +install-docs:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.