[csw-devel] SF.net SVN: gar:[6268] csw/mgar/pkg/gdome2/trunk

[dmichelsen at users.sourceforge.net]

Revision: 6268
          http://gar.svn.sourceforge.net/gar/?rev=6268&view=rev
Author:   dmichelsen
Date:     2009-09-11 13:35:15 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
gdome2: Use ginstall and fix DESTDIR

Modified Paths:
--------------
    csw/mgar/pkg/gdome2/trunk/Makefile
    csw/mgar/pkg/gdome2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff
    csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff

Modified: csw/mgar/pkg/gdome2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdome2/trunk/Makefile	2009-09-11 12:48:11 UTC (rev 6267)
+++ csw/mgar/pkg/gdome2/trunk/Makefile	2009-09-11 13:35:15 UTC (rev 6268)
@@ -10,6 +10,8 @@
 MASTER_SITES = http://gdome2.cs.unibo.it/tarball/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES = patch-nowall.diff
+PATCHFILES += patch-doc-destdir.diff
+PATCHFILES += patch-use-install.diff
 
 REQUIRED_PKGS = CSWggettextrt CSWglib2 CSWiconv CSWlibxml2 CSWzlib
 

Modified: csw/mgar/pkg/gdome2/trunk/checksums
===================================================================
--- csw/mgar/pkg/gdome2/trunk/checksums	2009-09-11 12:48:11 UTC (rev 6267)
+++ csw/mgar/pkg/gdome2/trunk/checksums	2009-09-11 13:35:15 UTC (rev 6268)
@@ -1,2 +1,4 @@
 bfc114e59eec50cbda8e4ece751ff022  download/gdome2-0.8.1.tar.gz
+6c8799423b9ef7a21d6b1b7edff27c9d  download/patch-doc-destdir.diff
 735f58dbc4b9524f313088fa02d0434b  download/patch-nowall.diff
+c2e11ca7b8a0b05d0db6823ed40e0494  download/patch-use-install.diff

Added: csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff
===================================================================
--- csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff	                        (rev 0)
+++ csw/mgar/pkg/gdome2/trunk/files/patch-doc-destdir.diff	2009-09-11 13:35:15 UTC (rev 6268)
@@ -0,0 +1,24 @@
+diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.am gdome2-0.8.1.patched/gtk-doc/Makefile.am
+--- gdome2-0.8.1.orig/gtk-doc/Makefile.am	2002-04-04 08:58:04.000000000 +0200
++++ gdome2-0.8.1.patched/gtk-doc/Makefile.am	2009-09-11 15:29:22.320277946 +0200
+@@ -9,7 +9,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR=../libgdome
+ 
+-HTML_DIR=@HTML_DIR@
++HTML_DIR=$(DESTDIR)@HTML_DIR@
+ 
+ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+ 
+diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.in gdome2-0.8.1.patched/gtk-doc/Makefile.in
+--- gdome2-0.8.1.orig/gtk-doc/Makefile.in	2003-10-05 22:52:52.000000000 +0200
++++ gdome2-0.8.1.patched/gtk-doc/Makefile.in	2009-09-11 15:29:44.962917775 +0200
+@@ -105,7 +105,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = ../libgdome
+ 
+-HTML_DIR = @HTML_DIR@
++HTML_DIR = $(DESTDIR)@HTML_DIR@
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 

Added: csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff
===================================================================
--- csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff	                        (rev 0)
+++ csw/mgar/pkg/gdome2/trunk/files/patch-use-install.diff	2009-09-11 13:35:15 UTC (rev 6268)
@@ -0,0 +1,32 @@
+diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.am gdome2-0.8.1.patched/gtk-doc/Makefile.am
+--- gdome2-0.8.1.orig/gtk-doc/Makefile.am	2002-04-04 08:58:04.000000000 +0200
++++ gdome2-0.8.1.patched/gtk-doc/Makefile.am	2009-09-11 15:10:49.023110574 +0200
+@@ -33,9 +33,9 @@
+ 	rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt 
+ 
+ install-data-local:
+-	-install -d -m 0755 $(TARGET_DIR)
+-	-install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
+-	-install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
++	-$(INSTALL) -d -m 0755 $(TARGET_DIR)
++	-$(INSTALL) -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
++	-$(INSTALL) -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
+ 	-(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR))
+ 
+ .PHONY : html sgml templates scan
+diff -Naur gdome2-0.8.1.orig/gtk-doc/Makefile.in gdome2-0.8.1.patched/gtk-doc/Makefile.in
+--- gdome2-0.8.1.orig/gtk-doc/Makefile.in	2003-10-05 22:52:52.000000000 +0200
++++ gdome2-0.8.1.patched/gtk-doc/Makefile.in	2009-09-11 15:11:27.730500581 +0200
+@@ -273,9 +273,9 @@
+ 	rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt 
+ 
+ install-data-local:
+-	-install -d -m 0755 $(TARGET_DIR)
+-	-install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
+-	-install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
++	-$(INSTALL) -d -m 0755 $(TARGET_DIR)
++	-$(INSTALL) -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
++	-$(INSTALL) -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
+ 	-(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR))
+ 
+ .PHONY : html sgml templates scan


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