build system improvements

diff --git a/Makefile b/Makefile
index 8fd1984..d84034e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+#!/usr/bin/make -f
+#
 # Makefile for Victrix Abyssi
 
 include dirs.mk
@@ -19,7 +21,7 @@ ARCHIVENAME:=victrix-abyssi_$(MAJVERS).$(MINVERS)
 
 ## PHONY targets in this section, please
 
-.PHONY: all archive clean code-docs debianize-archive install spotless
+.PHONY: all archive clean code-docs debianize-archive install my-debworkflow spotless
 
 all: $(GAME)
 
@@ -63,8 +65,8 @@ $(GAME): $(OBJS)
        $(CXX) $(DEVELOPMENT_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
 ## Dependencies for autogeneration
-permobj.cc pobj_id.hh: pobj_comp default.permobjs
-       ./pobj_comp default.permobjs
+permobj.cc pobj_id.hh: default.permobjs $(srcdir)/pobj_comp
+       $(srcdir)/pobj_comp $<
 
 ## Dependencies for the build
 combat.o: combat.cc combat.hh victrix-abyssi.hh monsters.hh objects.hh pobj_id.hh

diff --git a/configure b/configure
index 26e3313..9e911b4 100755 (executable)
--- a/configure
+++ b/configure
@@ -13,6 +13,7 @@ my $sbindir='$(exec_prefix)/sbin';
 my $libdir='$(exec_prefix)/lib';
 my $libexecdir='$(exec_prefix)/libexec';
 my $gamesdir='$(prefix)/games';
+my $srcdir='.';
 
 my $datarootdir='$(prefix)/share';
 my $datadir='$(datarootdir)/victrix-abyssi';
@@ -52,6 +53,7 @@ my $verbose=1;
 GetOptions(
 'prefix=s' => \$prefix, 'exec_prefix=s' => \$exec_prefix,
 'bindir=s' => \$bindir, 'libdir=s' => \$libdir,
+'srcdir=s' => \$srcdir,
 'libexecdir=s' => \$libexecdir, 'gamesdir=s' => \$gamesdir,
 'includedir=s' => \$includedir, 'oldincludedir=s' => \$oldincludedir,
 'datarootdir=s' => \$datarootdir, 'datadir=s' => \$datadir,
@@ -98,6 +100,7 @@ print DIRS_MK "sbindir=${sbindir}\n";
 print DIRS_MK "libdir=${libdir}\n";
 print DIRS_MK "libexecdir=${libexecdir}\n";
 print DIRS_MK "gamesdir=${gamesdir}\n";
+print DIRS_MK "srcdir=${srcdir}\n";
 print DIRS_MK "datarootdir=${datarootdir}\n";
 print DIRS_MK "datadir=${datadir}\n";
 print DIRS_MK "sysconfdir=${sysconfdir}\n";