qb: Turn $CONFIG_DEFINES from a temporary file into a variable.

mme4crt · Nov 24, 2017 · 6351e21 · 6351e21
1 parent 7ac5eda
commit 6351e21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -95,7 +95,6 @@ pkg/apple/iOS/modules/
 obj-unix/
 .vagrant/
 
-.CONFIG_DEFINES
 /pkg/msvc/Release Cg/*.exe
 /pkg/msvc/Release Cg/*.iobj
 /pkg/msvc/Release Cg/*.ipdb

diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh
@@ -1,12 +1,10 @@
 MAKEFILE_DEFINES=''
-CONFIG_DEFINES='.CONFIG_DEFINES'
-cat /dev/null > "$CONFIG_DEFINES"
-#cat /dev/null > "${CONFIG_DEFINES=.CONFIG_DEFINES}"
+CONFIG_DEFINES=''
 
 [ "$PREFIX" ] || PREFIX="/usr/local"
 
 add_define_header()
-{ echo "$1=$2" >> "$CONFIG_DEFINES";}
+{ CONFIG_DEFINES="${CONFIG_DEFINES} $1=$2"; }
 
 add_define_make()
 { MAKEFILE_DEFINES="${MAKEFILE_DEFINES} $1=$2"; }
@@ -207,9 +205,10 @@ create_config_header()
 			shift
 		done
 
-		while IFS='=' read -r VAR VAL; do
-			printf %s\\n "#define $VAR $VAL"
-		done < "$CONFIG_DEFINES"
+		eval "set -- $CONFIG_DEFINES"
+		for VAR do
+			printf %s\\n "#define ${VAR%%=*} ${VAR#*=}"
+		done
 
 		printf %s\\n '#endif'
 	} > "$outfile"
@@ -264,5 +263,3 @@ create_config_make()
 }
 
 . qb/config.libs.sh
-
-rm -f -- "$CONFIG_DEFINES"