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

[chninkel at users.sourceforge.net]

Revision: 20055
          http://gar.svn.sourceforge.net/gar/?rev=20055&view=rev
Author:   chninkel
Date:     2013-01-08 21:33:15 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
openssh/trunk: MAKECOOKIE should not be used in custom target

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

Modified: csw/mgar/pkg/openssh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openssh/trunk/Makefile	2013-01-08 21:30:33 UTC (rev 20054)
+++ csw/mgar/pkg/openssh/trunk/Makefile	2013-01-08 21:33:15 UTC (rev 20055)
@@ -200,6 +200,7 @@
 
 # adding documentation files
 pre-package: merge-config-files merge-doc-files merge-init-files merge-contrib-files merge-special-directories
+	@$(MAKECOOKIE)
 
 merge-contrib-files:
 	ginstall -D "$(WORKSRC_FIRSTMOD)/contrib/ssh-copy-id" "$(PKGROOT)/$(bindir)/ssh-copy-id"
@@ -218,7 +219,6 @@
 		(cd $(PKGROOT)/$(docdir)/$$DOCDIR && chmod -x $(DOCFILES)); \
 		ginstall $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)/$(docdir)/$$DOCDIR/; \
 	done
-	@$(MAKECOOKIE)
 
 merge-config-files:
 	# we change some default value in the server config file
@@ -226,7 +226,6 @@
 	perl -pi -e 's,^ *# *UsePAM *.*,UsePAM yes,g, s,^ *# *PrintMotd *.*,PrintMotd no,g; s,^ *# *X11Forwarding *.*,X11Forwarding yes,g' "$(PKGROOT)/$(sysconfdir)/ssh/sshd_config.CSW" 
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswusergroup" "$(PKGROOT)$(prefix)/etc/pkg/CSWossh/cswusergroup"
 	ginstall -D "$(WORKDIR_FIRSTMOD)/THIS_LOCATION_IS_DEPRECATED" "$(PKGROOT)/$(prefix)/etc/ssh/THIS_LOCATION_IS_DEPRECATED"
-	@$(MAKECOOKIE)
 
 merge-special-directories:
 	ginstall -d $(PKGROOT)$(localstatedir)/empty

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