SPECS: builder - allow rpmbuild-like --define too

sparky sparky at pld-linux.org
Mon Jul 17 00:10:16 CEST 2006


Author: sparky                       Date: Sun Jul 16 22:10:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- allow rpmbuild-like --define too

---- Files affected:
SPECS:
   builder (1.446 -> 1.447) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.446 SPECS/builder:1.447
--- SPECS/builder:1.446	Wed Jun 21 20:05:25 2006
+++ SPECS/builder	Mon Jul 17 00:10:11 2006
@@ -1903,9 +1903,14 @@
 		--define)
 			shift
 			MACRO="${1}"
-			VALUE="${2}"
-			shift 2
-			RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
+			shift
+			if echo "${MACRO}" | grep -q '\W'; then
+				RPMOPTS="${RPMOPTS} --define \"${MACRO}\""
+			else
+				VALUE="${1}"
+				shift
+				RPMOPTS="${RPMOPTS} --define \"${MACRO} ${VALUE}\""
+			fi
 			;;
 		--show-bconds | -show-bconds | -print-bconds | --print-bconds | -display-bconds | --display-bconds )
 			SHOW_BCONDS="yes"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.446&r2=1.447&f=u



More information about the pld-cvs-commit mailing list