X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fpackage%2Fdebian%2Frules;h=708d3eb2d591129102bc2ab8bb8c7d1a0e54fa7c;hp=b0b1db17538faa8e64a0c9f18b2918620253566a;hb=9208e1bde56ebb9cc550fd93034f1d4650518b11;hpb=2b635f090ec43c82958cef9369464aee4dd8975f

diff --git a/Ada95/package/debian/rules b/Ada95/package/debian/rules
old mode 100644
new mode 100755
index b0b1db17..708d3eb2
--- a/Ada95/package/debian/rules
+++ b/Ada95/package/debian/rules
@@ -14,7 +14,9 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 TARGET_DIR = $(CURDIR)/debian/adacurses
 SAMPLE_DIR = $(TARGET_DIR)/usr/bin/AdaCurses
 
-CFLAGS =
+CFLAGS   = $(shell dpkg-buildflags --get CFLAGS) $(CC_NORMAL)
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -O0
@@ -30,11 +32,16 @@ configure: configure-stamp
 configure-stamp:
 	dh_testdir
 
-	CFLAGS="$(CFLAGS)" ./configure \
+	CFLAGS="$(CFLAGS)" \
+	CPPFLAGS="$(CPPFLAGS)" \
+	LDFLAGS="$(LDFLAGS)" ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr \
-		--with-ada-sharedlib
+		--disable-rpath-link \
+		--with-shared \
+		--with-ada-sharedlib \
+		--without-pkg-config
 
 	touch configure-stamp
 
@@ -66,7 +73,7 @@ install-stamp: build-stamp
 	$(MAKE) install DESTDIR=$(TARGET_DIR)
 	
 	# FIXME: it would be nice to make these into separate packages
-	( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) )
+	( cd samples && $(MAKE) install.examples DESTDIR=$(TARGET_DIR) BINDIR=$(SAMPLE_DIR) )
 	( cd doc && $(MAKE) install.html DESTDIR=$(TARGET_DIR) )
 
 	touch install-stamp
@@ -86,6 +93,7 @@ binary-arch: build install
 	dh_compress
 	dh_fixperms
 	dh_installdeb
+	dh_makeshlibs
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums