fix some misuses of the recently added EXTRA_{CFLAGS,CPPFLAGS,LDFLAGS} variables

git-svn-id: svn://svn.openwrt.org/openwrt/packages@6248 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index 7bb3f53..c199856 100644 (file)
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -46,9 +46,9 @@ endef
 define Build/Configure
        (cd $(PKG_BUILD_DIR); rm -f config.cache; \
                $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-               CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+               CFLAGS="$(TARGET_CFLAGS)" \
+               CPPFLAGS="$$$$CPPFLAGS $(EXTRA_CPPFLAGS)" \
+               LDFLAGS="$(EXTRA_LDFLAGS)" \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \

diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index 8827338..1ca2037 100644 (file)
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -38,7 +38,7 @@ endef
 
 define Build/Compile
        $(call Build/Compile/Default, \
-               COPTS="\$$$$(EXTRA_CFLAGS)" \
+               COPTS="$(TARGET_CFLAGS)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                INSTALL="install" \
                all install \

diff --git a/net/wiviz/Makefile b/net/wiviz/Makefile
index ff7cc5f..da75545 100644 (file)
--- a/net/wiviz/Makefile
+++ b/net/wiviz/Makefile
@@ -31,8 +31,8 @@ endef
 
 define Build/Compile
        $(call Build/Compile/Default, \
-               CCOPTS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-               INCLUDE="" \
+               CCOPTS="$(TARGET_CFLAGS)" \
+               INCLUDE="$(EXTRA_CPPFLAGS)" \
                LDFLAGS="$(EXTRA_LDFLAGS)" \
        )
 endef

diff --git a/net/wrt-radauth/Makefile b/net/wrt-radauth/Makefile
index 1cfe084..b0e1646 100644 (file)
--- a/net/wrt-radauth/Makefile
+++ b/net/wrt-radauth/Makefile
@@ -35,8 +35,8 @@ endef
   
 define Build/Compile
        $(call Build/Compile/Default, \
-               CFLAGS="\$$$$(EXTRA_CFLAGS)" \
-               LDFLAGS="\$$$$(EXTRA_LDFLAGS)" \
+               CFLAGS="$(EXTRA_CFLAGS)" \
+               LDFLAGS="$(EXTRA_LDFLAGS)" \
        )
 endef
 

diff --git a/utils/hdparm/Makefile b/utils/hdparm/Makefile
index c74ec81..0fef9b6 100644 (file)
--- a/utils/hdparm/Makefile
+++ b/utils/hdparm/Makefile
@@ -37,8 +37,8 @@ endef
 
 define Build/Compile
        $(call Build/Compile/Default, \
-               CFLAGS="\$$$$(EXTRA_CFLAGS)" \
-               LDFLAGS="\$$$$(EXTRA_LDFLAGS)" \
+               CFLAGS="$(EXTRA_CFLAGS)" \
+               LDFLAGS="$(EXTRA_LDFLAGS)" \
        )
 endef
 

diff --git a/utils/procps/Makefile b/utils/procps/Makefile
index 1eb89bf..3650732 100644 (file)
--- a/utils/procps/Makefile
+++ b/utils/procps/Makefile
@@ -43,7 +43,7 @@ endef
 define Build/Compile
        $(call Build/Compile/Default, \
                CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="$(EXTRA_CFLAGS)" \
+               CPPFLAGS="$(EXTRA_CPPFLAGS)" \
                LDFLAGS="$(EXTRA_LDFLAGS)" \
        )
 endef