[Debburn-changes] r498 - cdrkit/trunk

[Eduard Bloch]

Author: blade
Date: 2006-11-27 10:15:40 +0100 (Mon, 27 Nov 2006)
New Revision: 498

Modified:
   cdrkit/trunk/INSTALL
   cdrkit/trunk/Makefile
Log:
Passing of cmaketweaks fixed

Modified: cdrkit/trunk/INSTALL
===================================================================
--- cdrkit/trunk/INSTALL	2006-11-27 08:34:55 UTC (rev 497)
+++ cdrkit/trunk/INSTALL	2006-11-27 09:15:40 UTC (rev 498)
@@ -36,7 +36,8 @@
 Example: 
 (AIX5l, /usr/lib is default lib dir but /usr/local/include is prefered by gcc
 for headers), command:
-  make CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib
+    make clean
+    make CFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib
  
 Problem: "make install" uses the wrong target directory and appends /usr/local to it.
 Solution: override the complete target path with PREFIX=... (see above)

Modified: cdrkit/trunk/Makefile
===================================================================
--- cdrkit/trunk/Makefile	2006-11-27 08:34:55 UTC (rev 497)
+++ cdrkit/trunk/Makefile	2006-11-27 09:15:40 UTC (rev 498)
@@ -1,22 +1,18 @@
 
-CMAKETWEAKS:=@true
+CMAKETWEAKS=true
 
 ifneq ($(CFLAGS),)
-CMAKETWEAKS.= && cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
+CMAKETWEAKS += && cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
 endif
 
 
 ifneq ($(LDFLAGS),)
-CMAKETWEAKS.= && cmake build -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS="$(LDFLAGS)"
+CMAKETWEAKS += && cmake -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS)" build
 endif
 
-ifneq ($(LDLAGS),)
-CMAKETWEAKS.= && cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
-endif
-
 ifneq ($(PREFIX),)
 install: build/Makefile
-CMAKETWEAKS.= && cmake build  -DCMAKE_INSTALL_PREFIX="$(PREFIX)"
+CMAKETWEAKS += && cmake build  -DCMAKE_INSTALL_PREFIX="$(PREFIX)"
 endif