summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will@willthompson.co.uk>2015-06-28 09:37:09 +0100
committerWill Thompson <will@willthompson.co.uk>2015-06-28 09:39:01 +0100
commite0a0ab12570af0a59a3165f6bad507a43a42f06c (patch)
treeefed5840146de19a676110740e4da79d94eaa7e5
parent85965cf6ec945fc82e2dd87983b4c43ed960766a (diff)
make maintainer-make-release tweaks
-rw-r--r--Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 31ef034..8f1aed6 100644
--- a/Makefile
+++ b/Makefile
@@ -43,11 +43,14 @@ dist/build/bustle-pcap: $(BUSTLE_PCAP_SOURCES) $(BUSTLE_PCAP_HEADERS)
-o $@ $(BUSTLE_PCAP_SOURCES) \
$(GIO_FLAGS) $(PCAP_FLAGS)
-dist/build/autogen/version.h: bustle.cabal
+dist/build/autogen/version.txt: bustle.cabal
@mkdir -p `dirname $@`
- perl -nle 'm/^Version:\s+(.*)$$/ and print qq(#define BUSTLE_VERSION "$$1")' \
+ perl -nle 'm/^Version:\s+(.*)$$/ and print $$1' \
$< > $@
+dist/build/autogen/version.h: dist/build/autogen/version.txt
+ echo '#define BUSTLE_VERSION "'`cat $<`'"' > $@
+
install: all
mkdir -p $(BINDIR)
cp $(BINARIES) $(BINDIR)
@@ -113,9 +116,9 @@ maintainer-binary-tarball: all
maintainer-update-messages-pot:
find Bustle -name '*.hs' -print0 | xargs -0 hgettext -k __ -o po/messages.pot
-maintainer-make-release: bustle.cabal
+maintainer-make-release: bustle.cabal dist/build/autogen/version.txt
cabal test
cabal sdist
- git tag -s -m 'Bustle '`perl -nle 'm/^Version:\s+(.*)$$/ and print qq($$1)' bustle.cabal` \
- bustle-`perl -nle 'm/^Version:\s+(.*)$$/ and print qq($$1)' bustle.cabal`
+ git tag -s -m 'Bustle '`cat dist/build/autogen/version.txt` \
+ bustle-`cat dist/build/autogen/version.txt`
make maintainer-binary-tarball