[csw-devel] SF.net SVN: gar:[3000] csw/mgar/gar/v2-dynamiclicense/gar.pkg.mk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Feb 6 16:36:47 CET 2009


Revision: 3000
          http://gar.svn.sourceforge.net/gar/?rev=3000&view=rev
Author:   dmichelsen
Date:     2009-02-06 15:36:47 +0000 (Fri, 06 Feb 2009)

Log Message:
-----------
mGAR v2 dynamiclicense: Fix when no license is set

Modified Paths:
--------------
    csw/mgar/gar/v2-dynamiclicense/gar.pkg.mk

Modified: csw/mgar/gar/v2-dynamiclicense/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-dynamiclicense/gar.pkg.mk	2009-02-06 15:25:17 UTC (rev 2999)
+++ csw/mgar/gar/v2-dynamiclicense/gar.pkg.mk	2009-02-06 15:36:47 UTC (rev 3000)
@@ -278,7 +278,8 @@
 # LICENSE may be a path starting with $(WORKROOTDIR) or a filename inside $(WORKSRC)
 
 merge-license-%:
-	$(_DBG)LICENSEFILE=$(or $(call licensefile,$*),$(error Cannot find license file for package $*)); \
+	$(_DBG)$(if $(or $(LICENSE),$(LICENSE_FULL),$(LICENSE_$*),$(LICENSE_FULL_$*)), \
+		LICENSEFILE=$(or $(call licensefile,$*),$(error Cannot find license file for package $*)); \
 		LICENSEDIR=$(call licensedir,$*); \
 		$(if $(or $(LICENSE_FULL),$(LICENSE_FULL_$*)), \
 		    if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \
@@ -286,7 +287,8 @@
 		     echo "  $$LICENSEDIR/license") > $(WORKDIR)/$*.copyright; \
 		) \
 		  mkdir -p $(PKGROOT)$$LICENSEDIR && \
-		  cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license 
+		  cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license \
+	)
 
 merge-license: $(foreach SPEC,$(_PKG_SPECS),merge-license-$(SPEC))
 


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



More information about the devel mailing list