SF.net SVN: gar:[22734] csw/mgar/pkg/libserf/trunk/Makefile

[rthurner at users.sourceforge.net]

Revision: 22734
          http://sourceforge.net/p/gar/code/22734
Author:   rthurner
Date:     2013-12-24 14:50:29 +0000 (Tue, 24 Dec 2013)
Log Message:
-----------
libserf, use different prefix to install before packaging, just like when not using scons

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

Modified: csw/mgar/pkg/libserf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libserf/trunk/Makefile	2013-12-24 12:52:41 UTC (rev 22733)
+++ csw/mgar/pkg/libserf/trunk/Makefile	2013-12-24 14:50:29 UTC (rev 22734)
@@ -46,7 +46,6 @@
 
 EXTRA_LIB = $(prefix)/bdb48/lib
 
-SCONS_FLAGS += PREFIX=$(prefix) 
 SCONS_FLAGS += APR=$(bindir)/apr-1-config
 SCONS_FLAGS += APU=$(bindir)/apu-1-config
 
@@ -55,14 +54,14 @@
 build-serf:
 	(cd $(WORKSRC); \
 		scons \
-		$(SCONS_FLAGS))
+		$(SCONS_FLAGS) PREFIX=$(prefix) )
 	@$(MAKECOOKIE)
 
 install-serf:
 	(cd $(WORKSRC); \
 		scons  \
 		$(SCONS_FLAGS) \
-		-Q --prefix=$(DESTDIR)$(BUILD_PREFIX) \
+		-Q PREFIX=$(DESTDIR)$(BUILD_PREFIX) \
 		install)
 	@$(MAKECOOKIE)
 

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