X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=package%2Fdebian%2Frules;h=8bd2135d9341563d66e960f33e6e3d749e56de7f;hb=141bf9b4f451aaab76480a358dec96cf60a66ec6;hp=b90fd5ce218704132ce1e42248ca23cfaf42a43e;hpb=6830dca51a4e50d41e7bd114bdbaa857b42a46f4;p=ncurses.git

diff --git a/package/debian/rules b/package/debian/rules
index b90fd5ce..8bd2135d 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules,v 1.40 2021/03/23 00:17:05 tom Exp $
+# $Id: rules,v 1.45 2022/10/22 18:35:38 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -12,12 +12,15 @@ PACKAGES.arch  = ncurses6 ncursest6
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 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
+BINDIR=$(MY_DIR)/bin
+LIBDIR=$(MY_DIR)/lib/$(DEB_HOST_MULTIARCH)
 MYDATA=/usr/local/ncurses/share/terminfo
 NORMAL_DIR=$(CURDIR)/debian/ncurses$(MY_ABI)
 THREAD_DIR=$(CURDIR)/debian/ncursest$(MY_ABI)
@@ -28,7 +31,7 @@ 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_ENV = RPATH_LIST=../lib:$(LIBDIR)
 	RPATH_OPT = --enable-rpath
 else
 	RPATH_ENV =
@@ -54,6 +57,7 @@ configure = \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=$(MY_DIR) \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--disable-echo \
 		--disable-getcap \
 		--disable-leaks \
@@ -131,8 +135,8 @@ patch-ncurses6-stamp:
 		-e 's/\.3menu$$/.3menu6/' \
 		-e 's/\.3panel$$/.3panel6/' \
 		-e 's/\.\([157]\)$$/6.\1/' \
-		man/man_db.renames
-	diff -u man/man_db.renames.bak man/man_db.renames || true
+		man/man_db.renames.in
+	diff -u man/man_db.renames.in.bak man/man_db.renames.in || true
 	touch $@
 
 config-ncurses6-stamp: patch-ncurses6-stamp
@@ -182,9 +186,9 @@ install-ncurses6-stamp: build-ncurses6-stamp
 	dh_prep        $(verbose) -pncurses6
 
 	$(MAKE) -C t/ncurses6 install.libs install.progs DESTDIR=$(NCURSES6_DIR)
-	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib
+	$(MAKE) -C t/ncurses6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(MY_DIR)/bin/ncurses$(MY_ABI)
+	mv t/ncurses6/test/ncurses $(NCURSES6_DIR)$(BINDIR)/ncurses$(MY_ABI)
 
 	touch $@
 
@@ -195,9 +199,9 @@ install-ncursest6-stamp: build-ncursest6-stamp
 	dh_prep        $(verbose) -pncursest6
 
 	$(MAKE) -C t/ncursest6 install.libs install.progs DESTDIR=$(NCURSEST6_DIR)
-	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(MY_DIR)/lib
+	$(MAKE) -C t/ncursest6/test ncurses LOCAL_LIBDIR=$(LIBDIR)
 
-	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(MY_DIR)/bin/ncursest$(MY_ABI)
+	mv t/ncursest6/test/ncurses $(NCURSEST6_DIR)$(BINDIR)/ncursest$(MY_ABI)
 
 	touch $@
 
@@ -209,6 +213,8 @@ install-ncurses6-doc-stamp: build-ncurses6-stamp
 
 	$(MAKE) -C t/ncurses6 install.man DESTDIR=$(NCURSES6_DIR)-doc
 
+	cd $(NCURSES6_DIR)-doc/usr/share/man/man1 && ln -sf tset6.1.gz reset6.1.gz
+
 	touch $@
 
 HTML_DESTDIR=$(NCURSES6_DIR)-doc-html/usr/share/ncurses6-doc-html
@@ -248,6 +254,13 @@ ifneq ($(PACKAGES.arch),)
 	rm -f $(PACKAGES.arch:%=install-%-stamp)
 	dh_testdir
 	dh_testroot
+
+	version=`set -x; awk 'BEGIN{major=minor=0} /^NCURSES_MAJOR/{major=$$3} /^NCURSES_MINOR/{minor=$$3} END{print major "." minor}' < dist.mk`; \
+	sed -i \
+		-e "s, usr/lib, usr/lib/$(DEB_HOST_MULTIARCH)," \
+		-e "s,6\.1,$${version}," \
+		debian/*.lintian-overrides
+
 	dh_lintian           $(verbose) $(PACKAGES.arch:%=-p%)
 	dh_installdocs       $(verbose) $(PACKAGES.arch:%=-p%)
 	dh_installchangelogs $(verbose) $(PACKAGES.arch:%=-p%)  NEWS