[Debburn-changes] r545 - cdrkit/trunk

Eduard Bloch blade at alioth.debian.org
Sat Dec 2 13:08:56 CET 2006


Author: blade
Date: 2006-12-02 13:08:56 +0100 (Sat, 02 Dec 2006)
New Revision: 545

Modified:
   cdrkit/trunk/Makefile
Log:
Add explicite rule for install: and use .PHONY to work around the install/INSTALL file problem (letter case) on cygwin

Modified: cdrkit/trunk/Makefile
===================================================================
--- cdrkit/trunk/Makefile	2006-12-02 12:01:42 UTC (rev 544)
+++ cdrkit/trunk/Makefile	2006-12-02 12:08:56 UTC (rev 545)
@@ -1,16 +1,14 @@
-
 ifneq ($(CFLAGS),)
 CMAKETWEAKS += cmake build -DCMAKE_C_FLAGS="$(CFLAGS)" || exit 1; 
 endif
 
-
 ifneq ($(LDFLAGS),)
 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
 
 
 all: build/Makefile
@@ -50,3 +48,14 @@
 	$(MAKE) build/Makefile
 	$(CMAKETWEAKS)
 	$(MAKE) -C build $(MAKE_FLAGS) $@
+
+# 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
+	$(MAKE) -C build $(MAKE_FLAGS) $@
+
+.PHONY: install
+
+




More information about the Debburn-changes mailing list