From aa233606dc5358292f26808439bd60836a9b5dfe Mon Sep 17 00:00:00 2001
From: Matěj Cepl <mcepl@redhat.com>
Date: Sun, 8 Sep 2013 22:29:44 +0200
Subject: New version from Debian

---
 wlp/module/Makefile.pre.in | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'wlp/module/Makefile.pre.in')

diff --git a/wlp/module/Makefile.pre.in b/wlp/module/Makefile.pre.in
index 05f108b..fce3177 100644
--- a/wlp/module/Makefile.pre.in
+++ b/wlp/module/Makefile.pre.in
@@ -94,8 +94,12 @@ TARGET=		python
 # Installed python binary (used only by boot target)
 PYTHON=		python
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 # Add more -I and -D options here
-CFLAGS=		$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS)
+CFLAGS=$(OPT) -I$(INCLUDEPY) -I$(EXECINCLUDEPY) $(DEFS) $(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
 
 # These two variables can be set in Setup to merge extensions.
 # See example[23].
@@ -126,12 +130,13 @@ RANLIB=		@RANLIB@
 MACHDEP=	@MACHDEP@
 SO=		@SO@
 LDSHARED=	@LDSHARED@
+BLDSHARED=	@BLDSHARED@
 CCSHARED=	@CCSHARED@
 LINKFORSHARED=	@LINKFORSHARED@
 CXX=		@CXX@
 
 # Install prefix for architecture-independent files
-prefix=		/usr/local
+prefix=		/usr
 
 # Install prefix for architecture-dependent files
 exec_prefix=	$(prefix)
@@ -264,6 +269,7 @@ sedscript:	$(MAKEFILE)
 	 -e '/^MACHDEP=/s/^MACHDEP=[ 	]*\(.*\)/s%@MACHDEP[@]%\1%/p' \
 	 -e '/^SO=/s/^SO=[ 	]*\(.*\)/s%@SO[@]%\1%/p' \
 	 -e '/^LDSHARED=/s/^LDSHARED=[ 	]*\(.*\)/s%@LDSHARED[@]%\1%/p' \
+	 -e '/^BLDSHARED=/s/^BLDSHARED=[ 	]*\(.*\)/s%@BLDSHARED[@]%\1%/p' \
 	 -e '/^CCSHARED=/s/^CCSHARED=[ 	]*\(.*\)/s%@CCSHARED[@]%\1%/p' \
 	 -e '/^SGI_ABI=/s/^SGI_ABI=[ 	]*\(.*\)/s%@SGI_ABI[@]%\1%/p' \
 	 -e '/^$L=/s/^$L=[ 	]*\(.*\)/s%@$L[@]%\1%/p' \
-- 
cgit