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

[chninkel at users.sourceforge.net]

Revision: 20631
          http://gar.svn.sourceforge.net/gar/?rev=20631&view=rev
Author:   chninkel
Date:     2013-04-07 09:29:16 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
conserver/trunk: make sure the new package will be compatible with the previous one

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

Modified: csw/mgar/pkg/conserver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/conserver/trunk/Makefile	2013-04-07 09:00:19 UTC (rev 20630)
+++ csw/mgar/pkg/conserver/trunk/Makefile	2013-04-07 09:29:16 UTC (rev 20631)
@@ -35,6 +35,11 @@
 CHECKPKG_OVERRIDES  = file-with-bad-content|/usr/local|root/opt/csw/share/examples/conserver/conserver.rc
 CHECKPKG_OVERRIDES += file-with-bad-content|/usr/local|root/opt/csw/share/examples/conserver/conserver.cf
 
+# Temporary override and conf path for the next package release which is just rebuilt against libssl 1.0
+CHECKPKG_OVERRIDES += discouraged-path-in-pkgmap|/opt/csw/var/log
+sysconfdir = $(prefix)/etc
+localstatedir = $(prefix)/var
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-uds
 CONFIGURE_ARGS += --with-libwrap
@@ -44,7 +49,7 @@
 LICENSE = LICENSE
 
 DISTFILES += cswconserver
-INITSMF = $(sysconfdir)/init.d/cswconserver
+INITSMF = /etc$(prefix)/init.d/cswconserver
 
 TEST_SCRIPTS = 
 
@@ -52,8 +57,8 @@
 
 post-merge: merge-init-script
 
-#
 merge-init-script:
-	ginstall -m 755 -d $(PKGROOT)$(sysconfdir)/init.d/
-	ginstall -m 755 $(FILEDIR)/cswconserver $(PKGROOT)$(sysconfdir)/init.d/cswconserver
+	ginstall -m 755 -d $(PKGROOT)/etc/$(prefix)/init.d/
+	ginstall -m 755 -d $(PKGROOT)/$(localstatedir)/log
+	ginstall -m 755 $(FILEDIR)/cswconserver $(PKGROOT)/etc/$(prefix)/init.d/cswconserver
 

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