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

[bdwalton at users.sourceforge.net]

Revision: 14356
          http://gar.svn.sourceforge.net/gar/?rev=14356&view=rev
Author:   bdwalton
Date:     2011-04-20 18:03:12 +0000 (Wed, 20 Apr 2011)

Log Message:
-----------
bacula/trunk: let PRESERVECONF do the config file renaming; add missing continuation in post-install script

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

Modified: csw/mgar/pkg/bacula/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bacula/trunk/Makefile	2011-04-20 17:46:45 UTC (rev 14355)
+++ csw/mgar/pkg/bacula/trunk/Makefile	2011-04-20 18:03:12 UTC (rev 14356)
@@ -199,6 +199,9 @@
 INITSMF = /etc/opt/csw/init.d/cswbacula-dir /etc/opt/csw/init.d/cswbacula-sd
 INITSMF += /etc/opt/csw/init.d/cswbacula-fd
 
+PRESERVECONF = $(sysconfdir)/bacula-dir.conf $(sysconfdir)/bacula-sd.conf
+PRESERVECONF += $(sysconfdir)/bacula-fd.conf $(sysconfdir)/bconsole.conf
+
 include gar/category.mk
 
 pre-configure-modulated:
@@ -215,12 +218,11 @@
 	@(cd $(WORKSRC)/platforms/solaris; \
 		ginstall -d -m 0755 $(INITD); \
 		(echo '#AUTOENABLE no'; cat bacula-dir) > bacula-dir.csw; \
-		ginstall -m 0755 bacula-dir.csw $(INITD)/cswbacula-dir
+		ginstall -m 0755 bacula-dir.csw $(INITD)/cswbacula-dir; \
 		for s in fd sd; do \
 			ginstall -m 0755 bacula-$$s. $(INITD)/cswbacula-$$s; \
 		done )
 	@(ginstall -d -m 0755 $(DESTDIR)/var/opt/csw/run)
 	@(ginstall -d -m 0755 $(DOCD); gcp -pR $(WORKSRC)/examples $(DOCD))
 	@(ginstall -m 0644 $(WORKDIR)/README.CSW $(DOCD))
-	@(cd $(DESTDIR)$(sysconfdir); for f in *conf; do mv $$f $$f.CSW; done)
 	@$(MAKECOOKIE)


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