From 7d7dd227db6612ac3aa555fec236907964404878 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 18 Feb 2014 14:04:23 +1100
Subject: packages gcc libvpx openssl portaudio: use escaped substitution style

prompted by sample package recipe on @TimothyGu's wiki
---
 src/gcc.mk       | 6 +++---
 src/libvpx.mk    | 8 ++++----
 src/openssl.mk   | 6 ++++--
 src/portaudio.mk | 8 ++++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/gcc.mk b/src/gcc.mk
index 6388b62..d00c698 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -83,7 +83,7 @@ define $(PKG)_BUILD_mingw-w64
     cd '$(1).crt-build' && '$(1)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \
         --host='$(TARGET)' \
         --prefix='$(PREFIX)/$(TARGET)' \
-        mxe-config-opts
+        @gcc-crt-config-opts@
     $(MAKE) -C '$(1).crt-build' -j '$(JOBS)' || $(MAKE) -C '$(1).crt-build' -j '$(JOBS)'
     $(MAKE) -C '$(1).crt-build' -j 1 install
 
@@ -95,8 +95,8 @@ define $(PKG)_BUILD_mingw-w64
     $($(PKG)_POST_BUILD)
 endef
 
-$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst mxe-config-opts,--disable-lib32,$($(PKG)_BUILD_mingw-w64))
-$(PKG)_BUILD_i686-w64-mingw32   = $(subst mxe-config-opts,--disable-lib64,$($(PKG)_BUILD_mingw-w64))
+$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @gcc-crt-config-opts@,--disable-lib32,$($(PKG)_BUILD_mingw-w64))
+$(PKG)_BUILD_i686-w64-mingw32   = $(subst @gcc-crt-config-opts@,--disable-lib64,$($(PKG)_BUILD_mingw-w64))
 
 define $(PKG)_BUILD_$(BUILD)
     for f in c++ cpp g++ gcc gcov; do \
diff --git a/src/libvpx.mk b/src/libvpx.mk
index e769c29..732d2d5 100644
--- a/src/libvpx.mk
+++ b/src/libvpx.mk
@@ -22,7 +22,7 @@ define $(PKG)_BUILD
         CROSS='$(TARGET)-' \
         ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --target=libvpx-target \
+        --target=@libvpx-target@ \
         --disable-examples \
         --disable-install-docs \
         --as=$(TARGET)-yasm
@@ -31,6 +31,6 @@ define $(PKG)_BUILD
     $(TARGET)-ranlib $(PREFIX)/$(TARGET)/lib/libvpx.a
 endef
 
-$(PKG)_BUILD_i686-pc-mingw32    = $(subst libvpx-target ,x86-win32-gcc ,$($(PKG)_BUILD))
-$(PKG)_BUILD_i686-w64-mingw32   = $(subst libvpx-target ,x86-win32-gcc ,$($(PKG)_BUILD))
-$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst libvpx-target ,x86_64-win64-gcc ,$($(PKG)_BUILD))
+$(PKG)_BUILD_i686-pc-mingw32    = $(subst @libvpx-target@,x86-win32-gcc,$($(PKG)_BUILD))
+$(PKG)_BUILD_i686-w64-mingw32   = $(subst @libvpx-target@,x86-win32-gcc,$($(PKG)_BUILD))
+$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @libvpx-target@,x86_64-win64-gcc,$($(PKG)_BUILD))
diff --git a/src/openssl.mk b/src/openssl.mk
index 80a57d2..4e41ba6 100644
--- a/src/openssl.mk
+++ b/src/openssl.mk
@@ -20,7 +20,7 @@ endef
 
 define $(PKG)_BUILD
     cd '$(1)' && CC='$(TARGET)-gcc' ./Configure \
-        mingw \
+        @openssl-target@ \
         zlib \
         $(if $(BUILD_STATIC),no-,)shared \
         no-capieng \
@@ -32,4 +32,6 @@ define $(PKG)_BUILD
         CROSS_COMPILE='$(TARGET)-'
 endef
 
-$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst mingw ,mingw64 ,$($(PKG)_BUILD))
+$(PKG)_BUILD_i686-pc-mingw32    = $(subst @openssl-target@,mingw,$($(PKG)_BUILD))
+$(PKG)_BUILD_i686-w64-mingw32   = $(subst @openssl-target@,mingw,$($(PKG)_BUILD))
+$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @openssl-target@,mingw64,$($(PKG)_BUILD))
diff --git a/src/portaudio.mk b/src/portaudio.mk
index 40b3744..e0f4f48 100644
--- a/src/portaudio.mk
+++ b/src/portaudio.mk
@@ -25,7 +25,7 @@ define $(PKG)_BUILD
     cd '$(1)' && ./configure \
         $(MXE_CONFIGURE_OPTS) \
         --with-host_os=mingw \
-        --with-winapi=portaudio-winapi \
+        --with-winapi=@portaudio-winapi@ \
         --with-dxdir=$(PREFIX)/$(TARGET) \
         ac_cv_path_AR=$(TARGET)-ar \
         $(if $(BUILD_SHARED),\
@@ -43,6 +43,6 @@ endef
 $(PKG)_WINAPI_MINGW_ORG = wmme,directx,wasapi,wdmks
 $(PKG)_WINAPI_MINGW_W64 = wmme,directx
 
-$(PKG)_BUILD_i686-pc-mingw32    = $(subst portaudio-winapi,$($(PKG)_WINAPI_MINGW_ORG),$($(PKG)_BUILD))
-$(PKG)_BUILD_i686-w64-mingw32   = $(subst portaudio-winapi,$($(PKG)_WINAPI_MINGW_W64),$($(PKG)_BUILD))
-$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst portaudio-winapi,$($(PKG)_WINAPI_MINGW_W64),$($(PKG)_BUILD))
+$(PKG)_BUILD_i686-pc-mingw32    = $(subst @portaudio-winapi@,$($(PKG)_WINAPI_MINGW_ORG),$($(PKG)_BUILD))
+$(PKG)_BUILD_i686-w64-mingw32   = $(subst @portaudio-winapi@,$($(PKG)_WINAPI_MINGW_W64),$($(PKG)_BUILD))
+$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst @portaudio-winapi@,$($(PKG)_WINAPI_MINGW_W64),$($(PKG)_BUILD))
-- 
cgit v0.12