Revision: 3678
http://gar.svn.sourceforge.net/gar/?rev=3678&view=rev
Author: dmichelsen
Date: 2009-03-09 14:00:31 +0000 (Mon, 09 Mar 2009)
Log Message:
-----------
mGAR v2: Fix dynamic copyright generation on packages with explicit gspec-files
Modified Paths:
--------------
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2009-03-09 13:55:23 UTC (rev 3677)
+++ csw/mgar/gar/v2/gar.pkg.mk 2009-03-09 14:00:31 UTC (rev 3678)
@@ -394,15 +394,15 @@
define licensefile
$(strip
$(or
- $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1))))
- $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))),
- )
+ $(call findlicensefile,$(or $(LICENSE_$(1)),$(LICENSE_FULL_$(1))))
+ $(call findlicensefile,$(or $(LICENSE),$(LICENSE_FULL))),
+ )
)
endef
merge-license-%: $(WORKDIR)
$(_DBG)$(if $(and $(LICENSE_$*),$(LICENSE_FULL_$*)),$(error Both
LICENSE_$* and LICENSE_FULL_$* have been specified where only one is allowed)) \
- $(if $(and $(filter $*,$(PACKAGES)),$(or
$(LICENSE),$(LICENSE_FULL),$(LICENSE_$*),$(LICENSE_FULL_$*))), \
+ $(if $(and $(filter $*,$(_PKG_SPECS)),$(or
$(LICENSE),$(LICENSE_FULL),$(LICENSE_$*),$(LICENSE_FULL_$*))), \
LICENSEFILE=$(or $(call licensefile,$*),$(if
$(_LICENSE_IS_DEFAULT),,$(error Cannot find license file for package $*))); \
LICENSEDIR=$(call licensedir,$*); \
if [ -n "$$LICENSEFILE" ]; then \
@@ -414,8 +414,10 @@
cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \
fi \
)
+ $(MAKECOOKIE)
merge-license: $(foreach SPEC,$(_PKG_SPECS),merge-license-$(SPEC))
+ $(DONADA)
# package - Use the mkpackage utility to create Solaris packages
#
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
