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

[bdwalton at users.sourceforge.net]

Revision: 14707
          http://gar.svn.sourceforge.net/gar/?rev=14707&view=rev
Author:   bdwalton
Date:     2011-06-04 19:30:19 +0000 (Sat, 04 Jun 2011)

Log Message:
-----------
bacula/trunk: move scriptdir back under sysconfdir (debian does this too) as these are "configurable" scripts

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

Modified: csw/mgar/pkg/bacula/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bacula/trunk/Makefile	2011-06-04 16:34:15 UTC (rev 14706)
+++ csw/mgar/pkg/bacula/trunk/Makefile	2011-06-04 19:30:19 UTC (rev 14707)
@@ -213,7 +213,7 @@
 CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix)
 CONFIGURE_ARGS += --with-openssl=$(prefix)
 CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5
-CONFIGURE_ARGS += --with-scriptdir=$(libexecdir_install)/$(NAME)
+CONFIGURE_ARGS += --with-scriptdir=$(sysconfdir)/scripts
 CONFIGURE_ARGS += --with-logdir=$(localstatedir)/log/$(NAME)
 CONFIGURE_ARGS += --with-pid-dir=$(localstatedir)/run
 CONFIGURE_ARGS += --with-subsys-dir=$(localstatedir)/run/subsys
@@ -276,7 +276,7 @@
 PROTOTYPE_CLASS_confgroup = cswpreserveconf
 PROTOTYPE_GROUP_confgroup = bacula
 PROTOTYPE_PERMS_confgroup = 0640
-PROTOTYPE_FILES_generalperms = /opt/csw/sbin/.* /opt/csw/libexec/bacula/.*
+PROTOTYPE_FILES_generalperms = /opt/csw/sbin/.* /etc/opt/csw/bacula/scripts
 PROTOTYPE_PERMS_generalperms = 0755
 
 include gar/category.mk
@@ -307,11 +307,6 @@
 		ginstall -d -m 0755 $(DOCD)_$$p; \
 		ginstall -m 0644 $(WORKDIR)/postmsg $(DOCD)_$$p/README.postmsg; \
 	done)
-	@( cd $(DESTDIR)/opt/csw/libexec/bacula/; \
-	   for f in mtx-changer.conf query.sql; do \
-		mv $$f $(DESTDIR)/etc/opt/csw/bacula/$$f; \
-		ln -s /etc/opt/csw/bacula/$$f $$f; \
-	   done)
 	@( cd $(DESTDIR)/etc/opt/csw/bacula; \
 		perl -pi -e "s!<bacula-source>!$(docdir)/$(NAME)!" query.sql )
 	@$(MAKECOOKIE)


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