[csw-devel] SF.net SVN: gar:[11042] csw/mgar/pkg/postgresql/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 11042
          http://gar.svn.sourceforge.net/gar/?rev=11042&view=rev
Author:   dmichelsen
Date:     2010-09-22 13:42:57 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
postgresql: As of r11041 docdir now works for the first time!

Modified Paths:
--------------
    csw/mgar/pkg/postgresql/trunk/Makefile

Modified: csw/mgar/pkg/postgresql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-22 13:16:37 UTC (rev 11041)
+++ csw/mgar/pkg/postgresql/trunk/Makefile	2010-09-22 13:42:57 UTC (rev 11042)
@@ -41,7 +41,6 @@
 localstatedir = /var$(prefix)/$(pgsubdir)
 sysconfdir = /etc$(prefix)/$(pgsubdir)
 datadir = $(prefix)/share/$(pgsubdir)
-# TODO: docdir is not honoured, installation still goes to /opt/csw/share/doc/postgresql
 docdir = $(prefix)/share/doc/$(GARNAME)-$(BASE_VERSION)
 includedir = $(prefix)/include/$(pgsubdir)
 infodir = $(datadir)/info
@@ -151,8 +150,6 @@
 # CSWpostgresql is a generic wrapper always pointing to the latest release
 PKGFILES_CSWpostgresql                        = NOFILES
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc  = $(PKGFILES_DOC)
-# Use this workaound until $(docdir) is honoured
-PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc += $(prefix)/share/doc.*
 PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev  = $(PKGFILES_DEVEL)
 
 PKGFILES_CSWlibpq-$(BASE_VERSION_G)           = $(call baseisadirs,$(libdir),libpq\.so(\.\d+)*)
@@ -255,10 +252,6 @@
 	ginstall -d $(PKGROOT)$(docdir)
 	# ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir)
 	ginstall -m 755 -d $(PKGROOT)$(prefix)/bin
-	# TBD: Do alternatives here
-	#for b in $(BIN_NAMES); do \
-	#  gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \
-	#done
 	ginstall -d $(PKGROOT)$(PGDATA)
 	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
 	for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/libpq.*)); do \


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