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

[wbonnet at users.sourceforge.net]

Revision: 2980
          http://gar.svn.sourceforge.net/gar/?rev=2980&view=rev
Author:   wbonnet
Date:     2009-02-03 22:34:48 +0000 (Tue, 03 Feb 2009)

Log Message:
-----------
Update makefile

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

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2009-02-03 21:40:59 UTC (rev 2979)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2009-02-03 22:34:48 UTC (rev 2980)
@@ -20,27 +20,28 @@
 
 # SMF support
 SPKG_CLASSES = none cswinitsmf
-PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/init.d\/cswfoo$$$$/ { $$$$2 = "cswinitsmf" } { print }'
+PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/init.d\/cswdbus$$$$/ { $$$$2 = "cswinitsmf" } { print }'
 	
-DISTFILES    += $(call admfiles,CSWdbus, preinstall, cswdbus)
+DISTFILES    += $(call admfiles,CSWdbus, preinstall, )
 DISTFILES    += cswdbus
 DISTFILES    += $(call admfiles,CSWlibdbusdev, )
 DISTFILES    += $(call admfiles,CSWlibdbus, )
 
 # Dynamic CSWlibdbusdev prototype
 PKGFILES_CSWlibdbusdev  = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibdbusdev += $(includedir)/include/.*
-PKGFILES_CSWlibdbusdev += $(libdir)/dbus-1.0/.*
-PKGFILES_CSWlibdbusdev += $(libdir)/.*\.a
-PKGFILES_CSWlibdbusdev += $(libdir)/pkgconfig/.*
+PKGFILES_CSWlibdbusdev += $(includedir)/include/(.*)
+PKGFILES_CSWlibdbusdev += $(libdir)/dbus-1.0/(.*)
+PKGFILES_CSWlibdbusdev += $(libdir)/(.*)\.a
+PKGFILES_CSWlibdbusdev += $(libdir)/pkgconfig/(.*)
 
 # Dynamic CSWlibdbus prototype
-PKGFILES_CSWlibdbus     = $(libdir)/.*\.la
-PKGFILES_CSWlibdbus    += $(libdir)/.*\.so
-PKGFILES_CSWlibdbus    += $(libdir)/.*\.so\..*
+PKGFILES_CSWlibdbus     = $(PKGFILES_RT)
+PKGFILES_CSWlibdbus    += $(libdir)/(.*)\.la
+PKGFILES_CSWlibdbus    += $(libdir)/(.*)\.so
+PKGFILES_CSWlibdbus    += $(libdir)/(.*)\.so\.(.*)
 
 # Dependencies tracking
-REQUIRED_PKGS_CSWdbus	    += CSWexpat CSWlibx11 CSWlibxau CSWlibxcb CSWlibxdmcp CSWlibdbus CSWcswclassutils
+REQUIRED_PKGS_CSWdbus	    += CSWexpat CSWlibdbus CSWcswclassutils
 REQUIRED_PKGS_CSWlibdbusdev  = CSWlibdbus
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -53,9 +54,9 @@
 post-install:
 	( ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d  ; \
 	  ginstall -d $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/init.d  ; \
-	  cp -fr $(FILEDIR)/csw$(GARNAME) $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/init.d  ; \
-	  rm -f $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52$(GARNAME)  ; \
-	  ln -s ../init.d/csw$(GARNAME) $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52$(GARNAME)  ; )
+	  cp -fr $(FILEDIR)/cswdbus $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/init.d  ; \
+	  rm -f $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52cswdbus  ; \
+	  ln -s ../init.d/cswdbus $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))/etc/rc3.d/S52cswdbus  ; )
 
 include gar/category.mk
 


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