X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=package%2Fdebian%2Frules;fp=package%2Fdebian%2Frules;h=1b35dfcd44f9ff55f99b92e470ed65629c2fb79f;hp=c66edd4921c3ba6f62beecc823bd16da7f32903e;hb=0819b56c3096ed77dd36312b0c4e8f37e7d46c88;hpb=808858ace09b9bf60f7154e33cb6572f49347101

diff --git a/package/debian/rules b/package/debian/rules
index c66edd49..1b35dfcd 100644
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -14,9 +14,10 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 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_DIR=/usr/local/ncurses6
+MY_ABI=6
+MY_DIR=/usr/local/ncurses$(MY_ABI)
 MYDATA=/usr/local/ncurses/share/terminfo
-BUILD_DIR=$(CURDIR)/debian/ncurses6
+BUILD_DIR=$(CURDIR)/debian/ncurses$(MY_ABI)
 
 CFLAGS = $(CC_NORMAL)
 
@@ -57,11 +58,12 @@ configure-stamp:
 		--enable-sp-funcs \
 		--enable-warnings \
 		--enable-widec \
+		--program-suffix=$(MY_ABI) \
 		--verbose \
 		--with-chtype=uint32_t \
 		--with-mmask_t=uint32_t \
 		--with-develop \
-		--with-pc-suffix=6 \
+		--with-extra-suffix=$(MY_ABI) \
 		--with-shared \
 		--with-termlib \
 		--with-ticlib \
@@ -103,7 +105,7 @@ install-stamp: build-stamp
 	$(MAKE) install.libs install.progs DESTDIR=$(BUILD_DIR)
 
 	( cd test && make ncurses LOCAL_LIBDIR=$(MY_DIR)/lib )
-	mv test/ncurses $(BUILD_DIR)$(MY_DIR)/bin/ncurses6
+	mv test/ncurses $(BUILD_DIR)$(MY_DIR)/bin/ncurses$(MY_ABI)
 
 	touch install-stamp