[csw-devel] SF.net SVN: gar:[8998] csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sat Mar 6 13:33:16 CET 2010


Revision: 8998
          http://gar.svn.sourceforge.net/gar/?rev=8998&view=rev
Author:   wahwah
Date:     2010-03-06 12:33:16 +0000 (Sat, 06 Mar 2010)

Log Message:
-----------
xcbproto: A better handling of the conditionals; gmake fill stop the build if the directory is not there and the construct '[ -d ... ] && command' is used without the '|| true' suffix.

Modified Paths:
--------------
    csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile

Modified: csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile	2010-03-06 12:27:08 UTC (rev 8997)
+++ csw/mgar/pkg/freedesktop/xcbproto/trunk/Makefile	2010-03-06 12:33:16 UTC (rev 8998)
@@ -60,8 +60,8 @@
 # This bit is probably somewhat objectionable, but it gets the job done.
 post-merge:
 	ginstall -m 755 -d $(PKGROOT)/opt/csw/lib
-	[ -d $(PKGROOT)$(prefix)/lib/python ] \
-		&& \
-		gmv -v $(PKGROOT)$(prefix)/lib/python $(PKGROOT)/opt/csw/lib
+	if [ -d $(PKGROOT)$(prefix)/lib/python ]; then \
+		gmv -v $(PKGROOT)$(prefix)/lib/python $(PKGROOT)/opt/csw/lib; \
+	fi
 	grm -fv $(PKGROOT)/opt/csw/lib/python/site-packages/xcbgen/*.py[co]
 	@$(MAKECOOKIE)


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