diff --git a/.gitignore b/.gitignore index 9052ed2ea4..ad6ea6ab19 100644 --- 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 index 2715c3e77e..e8dce8c14b 100644 --- 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"