X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=package%2Fdebian%2Frules;h=bff27f2b75a5fc3e3572064f9bd4ed6838499b24;hp=4743fb7bcd74d00f33259e2abb9fa3af0c5ee53c;hb=aabb3a65ee5d88949abe529b5131adedb9cfab84;hpb=ee1bcda2cbb28cd84f136d8343cf83b7e576bd79

diff --git a/package/debian/rules b/package/debian/rules
index 4743fb7b..bff27f2b 100644
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -15,11 +15,21 @@ CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion
 CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic
 
 MY_ABI=6
-MY_DIR=/usr/local/ncurses$(MY_ABI)
+MY_DIR=/usr
 MYDATA=/usr/local/ncurses/share/terminfo
 BUILD_DIR=$(CURDIR)/debian/ncurses$(MY_ABI)
 
-CFLAGS = $(CC_NORMAL)
+CFLAGS   = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL)
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+
+ifneq ($(MY_DIR),/usr)
+	RPATH_ENV = RPATH_LIST=../lib:$(MY_DIR)/lib
+	RPATH_OPT = --enable-rpath
+else
+	RPATH_ENV =
+	RPATH_OPT = --disable-rpath --disable-rpath-hack
+endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
@@ -35,8 +45,10 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	RPATH_LIST=../lib:$(MY_DIR)/lib \
-	CFLAGS="$(CFLAGS)" ./configure \
+	$(RPATH_ENV) \
+	CFLAGS="$(CFLAGS)" \
+	CPPFLAGS="$(CPPFLAGS)" \
+	LDFLAGS="$(LDFLAGS)" ./configure $(RPATH_OPT) \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=$(MY_DIR) \
@@ -46,6 +58,7 @@ configure-stamp:
 		--disable-getcap \
 		--disable-leaks \
 		--disable-macros  \
+		--disable-overwrite  \
 		--disable-termcap \
 		--enable-const \
 		--enable-ext-colors \
@@ -54,9 +67,9 @@ configure-stamp:
 		--enable-hard-tabs \
 		--enable-interop \
 		--enable-pc-files \
-		--enable-rpath \
 		--enable-sp-funcs \
 		--enable-warnings \
+		--enable-wgetch-events \
 		--enable-widec \
 		--program-suffix=$(MY_ABI) \
 		--verbose \