[Goodies-commits] r6301 - in sion/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2008-12-13 17:07:18 +0000 (Sat, 13 Dec 2008)
New Revision: 6301

Modified:
   sion/trunk/ChangeLog
   sion/trunk/Makefile
   sion/trunk/configure
   sion/trunk/src/Makefile
Log:
Fix creation of the Makefile and usage of --prefix=...

Modified: sion/trunk/ChangeLog
===================================================================
--- sion/trunk/ChangeLog	2008-12-13 16:33:35 UTC (rev 6300)
+++ sion/trunk/ChangeLog	2008-12-13 17:07:18 UTC (rev 6301)
@@ -0,0 +1,5 @@
+2008-12-13  Enrico Tröger  <enrico(at)xfce(dot)org>
+
+ * configure, Makefile, src/Makefile:
+   Fix creation of the Makefile and usage of --prefix=...
+

Modified: sion/trunk/Makefile
===================================================================
--- sion/trunk/Makefile	2008-12-13 16:33:35 UTC (rev 6300)
+++ sion/trunk/Makefile	2008-12-13 17:07:18 UTC (rev 6301)
@@ -1,46 +1,45 @@
 #!/usr/bin/make -f
 # Waf Makefile wrapper
-WAF_HOME=/home/enrico/projects/sion
 
 all:
-	@/home/enrico/projects/sion/waf build
+	@./waf build
 
 all-debug:
-	@/home/enrico/projects/sion/waf -v build
+	@./waf -v build
 
 all-progress:
-	@/home/enrico/projects/sion/waf -p build
+	@./waf -p build
 
 install:
-	if test -n "$(DESTDIR)"; then \
-		/home/enrico/projects/sion/waf install --yes --destdir="$(DESTDIR)" --prefix="/usr/local"; \
+	@if test -n "$(DESTDIR)"; then \
+		./waf install --destdir="$(DESTDIR)"; \
 	else \
-		/home/enrico/projects/sion/waf install --yes --prefix="/usr/local"; \
+		./waf install; \
 	fi;
 
 uninstall:
 	@if test -n "$(DESTDIR)"; then \
-		/home/enrico/projects/sion/waf uninstall --destdir="$(DESTDIR)" --prefix="/usr/local"; \
+		./waf uninstall --destdir="$(DESTDIR)"; \
 	else \
-		/home/enrico/projects/sion/waf uninstall --prefix="/usr/local"; \
+		./waf uninstall; \
 	fi;
 
 clean:
-	@/home/enrico/projects/sion/waf clean
+	@./waf clean
 
 distclean:
-	@/home/enrico/projects/sion/waf distclean
+	@./waf distclean
 	@-rm -rf _build_
 	@-rm -f Makefile
 
 distcheck:
-	@/home/enrico/projects/sion/waf distcheck
+	@./waf distcheck
 
 dist:
-	@/home/enrico/projects/sion/waf dist
+	@./waf dist
 
 sign:
-	@/home/enrico/projects/sion/waf --sign
+	@./waf --sign
 
 .PHONY: clean dist distclean check uninstall install all
 

Modified: sion/trunk/configure
===================================================================
--- sion/trunk/configure	2008-12-13 16:33:35 UTC (rev 6300)
+++ sion/trunk/configure	2008-12-13 17:07:18 UTC (rev 6301)
@@ -95,7 +95,6 @@
 	cat > Makefile << EOF
 #!/usr/bin/make -f
 # Waf Makefile wrapper
-WAF_HOME=$CUR_DIR
 
 all:
 	@$WAF build
@@ -107,17 +106,17 @@
 	@$WAF -p build
 
 install:
-	if test -n "\$(DESTDIR)"; then \\
-		$WAF install --yes --destdir="\$(DESTDIR)" --prefix="$PREFIX"; \\
+	@if test -n "\$(DESTDIR)"; then \\
+		$WAF install --destdir="\$(DESTDIR)"; \\
 	else \\
-		$WAF install --yes --prefix="$PREFIX"; \\
+		$WAF install; \\
 	fi;
 
 uninstall:
 	@if test -n "\$(DESTDIR)"; then \\
-		$WAF uninstall --destdir="\$(DESTDIR)" --prefix="$PREFIX"; \\
+		$WAF uninstall --destdir="\$(DESTDIR)"; \\
 	else \\
-		$WAF uninstall --prefix="$PREFIX"; \\
+		$WAF uninstall; \\
 	fi;
 
 clean:
@@ -144,7 +143,6 @@
 	cat > src/Makefile << EOF
 #!/usr/bin/make -f
 # Waf Makefile wrapper
-WAF_HOME=$CUR_DIR
 
 all:
 	cd .. && $WAF build
@@ -161,17 +159,8 @@
 checkPython
 checkWAF
 
-PREFIX=/usr/local
-case $1 in
-    --prefix)
-        PREFIX=$2
-        ;;
-esac
-
-export PREFIX
 generateMakefile
 
+"${WAF}" configure $@
 
-"${WAF}" configure --prefix "${PREFIX}"
-
 exit $?

Modified: sion/trunk/src/Makefile
===================================================================
--- sion/trunk/src/Makefile	2008-12-13 16:33:35 UTC (rev 6300)
+++ sion/trunk/src/Makefile	2008-12-13 17:07:18 UTC (rev 6301)
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 # Waf Makefile wrapper
-WAF_HOME=/home/enrico/projects/sion
 
 all:
-	cd .. && /home/enrico/projects/sion/waf build
+	cd .. && ./waf build
 
 all-debug:
-	cd .. && /home/enrico/projects/sion/waf -v build
+	cd .. && ./waf -v build
 
 clean:
-	cd .. && /home/enrico/projects/sion/waf clean
+	cd .. && ./waf clean