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

[dmichelsen at users.sourceforge.net]

Revision: 17309
          http://gar.svn.sourceforge.net/gar/?rev=17309&view=rev
Author:   dmichelsen
Date:     2012-03-06 10:09:23 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
mGAR v2: Allow direct license in the Makefile with LICENSE_TEXT and LICENSE_TEXT_<pkg>

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

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2012-03-06 09:13:05 UTC (rev 17308)
+++ csw/mgar/gar/v2/gar.pkg.mk	2012-03-06 10:09:23 UTC (rev 17309)
@@ -714,15 +714,21 @@
 		$(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 \
-		$(if $(or $(LICENSE_FULL),$(LICENSE_FULL_$*)), \
-		    if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \
-		    echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \
+		$(if $(LICENSE_TEXT_$*)$(LICENSE_TEXT),\
+		  umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \
+		  echo "$(or $(LICENSE_TEXT_$*),$(LICENSE_TEXT))" > $(PKGROOT)$$LICENSEDIR/license;\
+		  echo "$(or $(LICENSE_TEXT_$*),$(LICENSE_TEXT))" > $(WORKDIR)/$*.copyright;\
+		,\
+		  if [ -n "$$LICENSEFILE" ]; then \
+		    $(if $(or $(LICENSE_FULL),$(LICENSE_FULL_$*)), \
+		      if [ -f "$$LICENSEFILE" ]; then cp $$LICENSEFILE $(WORKDIR)/$*.copyright; fi;, \
+		      echo "Please see $$LICENSEDIR/license for license information." > $(WORKDIR)/$*.copyright; \
+		    ) \
+		    umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \
+		    rm -f $(PKGROOT)$$LICENSEDIR/license && \
+		    cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \
+		  fi \
 		) \
-		  umask 022 && mkdir -p $(PKGROOT)$$LICENSEDIR && \
-		  rm -f $(PKGROOT)$$LICENSEDIR/license && \
-		  cp $$LICENSEFILE $(PKGROOT)$$LICENSEDIR/license; \
-		fi \
 	)
 	@$(MAKECOOKIE)
 

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