[Debburn-changes] r548 - cdrkit/trunk

[Eduard Bloch]

Author: blade
Date: 2006-12-02 16:08:41 +0100 (Sat, 02 Dec 2006)
New Revision: 548

Modified:
   cdrkit/trunk/Makefile
Log:
Some gmake version seems to prefer fallback instead of explicite install rule. added cmaketweaks to both ways.

Modified: cdrkit/trunk/Makefile
===================================================================
--- cdrkit/trunk/Makefile	2006-12-02 14:58:19 UTC (rev 547)
+++ cdrkit/trunk/Makefile	2006-12-02 15:08:41 UTC (rev 548)
@@ -6,6 +6,10 @@
 CMAKETWEAKS += cmake -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS)" build || exit 1; 
 endif
 
+ifneq ($(PREFIX),)
+CMAKETWEAKS += cmake build -DCMAKE_INSTALL_PREFIX="$(PREFIX)" || exit 1; 
+endif
+
 #ifneq ($(PREFIX),)
 #CMAKETWEAKS += cmake build  -DCMAKE_INSTALL_PREFIX="$(PREFIX)" || exit 1 ; 
 #endif
@@ -45,9 +49,7 @@
 
 # needs to be explicite, for PHONY and install (AKA INSTALL) file on cygwin
 install: build/Makefile
-ifneq ($(PREFIX),)
-	cmake build -DCMAKE_INSTALL_PREFIX="$(PREFIX)"
-endif
+	$(CMAKETWEAKS)
 	$(MAKE) -C build $(MAKE_FLAGS) $@
 
 .PHONY: install