[nethack] 11/31: Adjust build process in debian/rules for 3.6

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master
in repository nethack.

commit a65397e673f4b8c36940ccaa504c10bde5aa55de
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Thu Mar 3 10:01:50 2016 +0000

    Adjust build process in debian/rules for 3.6
---
 debian/rules | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 52d2fcb..bd5143e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,17 +15,14 @@ LFLAGS = $(DEB_CFLAGS) $(DEB_LDFLAGS)
 
 build-arch: build-arch-stamp
 build-arch-stamp: Makefile
-	if dpkg-buildflags --status >/dev/null 2>&1 ; then dpkg-buildflags --status ; fi
 	+$(call build_target,console)
 	+$(call build_target,x11)
 	+$(call build_target,lisp)
 	touch src/nethack.dummy ; sleep 2
 	$(MAKE) -j1 LFLAGS='$(LFLAGS)' CFLAGS='$(CFLAGS) -DUSE_XPM' \
 	  GAME=src/nethack.dummy \
-	  VARDATND="x11tiles pet_mark.xbm rip.xpm mapbg.xpm" \
-	  Guidebook data oracles options quest.dat rumors dungeon spec_levs \
-	  check-dlb x11tiles pet_mark.xbm rip.xpm mapbg.xpm
-	$(MAKE) -C util LFLAGS='$(LFLAGS)' CFLAGS='$(CFLAGS)' recover
+	  VARDATND="x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm mapbg.xpm" \
+	  all
 	touch $@
 
 TARGETS = console lisp x11
@@ -36,7 +33,7 @@ define build_target
 	sleep 2
 	$(MAKE) LFLAGS='$(LFLAGS)' CFLAGS='$(CFLAGS) $(EXTRACPP_$1)' \
 		WINSRC='$(SRC_$1)' WINOBJ='$(OBJ_$1)' WINLIB='$(LIB_$1)' \
-		$(EXTRA_$1) GAME='nethack.$1' \
+		LINK='$$(CC)' $(EXTRA_$1) GAME='nethack.$1' \
 		-C src 'nethack.$1'
 endef
 SRC_console = $$(WINTTYSRC) $$(WINCURSESSRC)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nethack.git