diff options
| author | Will Thompson <will@willthompson.co.uk> | 2012-01-09 18:34:21 +0000 |
|---|---|---|
| committer | Will Thompson <will@willthompson.co.uk> | 2012-01-09 18:34:21 +0000 |
| commit | 8470b8b02c82ed704302807068c366460c26994b (patch) | |
| tree | e5c3296b61ebd3bdf2ca2c1a3a1660c4124df71f /Makefile | |
| parent | f4c679d54210d964aec6e7883af77b8d482b476a (diff) | |
Fix the release creation thing again
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -13,9 +13,11 @@ BINARIES = \ all: $(BINARIES) dist/build/bustle-dbus-monitor: c-sources/bustle-dbus-monitor.c + @mkdir -p dist/build $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(DBUS_FLAGS) dist/build/bustle-pcap: c-sources/bustle-pcap.c + @mkdir -p dist/build $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< \ $(GIO_FLAGS) $(PCAP_FLAGS) @@ -33,17 +35,19 @@ clean: # Binary tarball stuff. Please ignore this unless you're making a release. TOP := $(shell pwd) -TARBALL_DIR := dist/$(shell git describe --tags)-$(shell uname -m) +TARBALL_PARENT_DIR := dist +TARBALL_DIR := $(shell git describe --tags)-$(shell uname -m) +TARBALL_FULL_DIR := $(TARBALL_PARENT_DIR)/$(TARBALL_DIR) TARBALL := $(TARBALL_DIR).tar.bz2 maintainer-binary-tarball: all - mkdir -p $(TARBALL_DIR) - cabal-dev configure --prefix=$(TOP)/$(TARBALL_DIR) \ - --datadir=$(TOP)/$(TARBALL_DIR) --datasubdir=. + mkdir -p $(TARBALL_FULL_DIR) + cabal-dev configure --prefix=$(TOP)/$(TARBALL_FULL_DIR) \ + --datadir=$(TOP)/$(TARBALL_FULL_DIR) --datasubdir=. cabal-dev build cabal-dev copy - cp bustle.sh README $(TARBALL_DIR) + cp bustle.sh README $(TARBALL_FULL_DIR) perl -pi -e 's{^ bustle-pcap}{ ./bustle-pcap};' \ -e 's{^ bustle} { ./bustle.sh};' \ - $(TARBALL_DIR)/README - cp $(BINARIES) $(TARBALL_DIR) - tar cjf $(TARBALL) $(TARBALL_DIR) + $(TARBALL_FULL_DIR)/README + cp $(BINARIES) $(TARBALL_FULL_DIR) + cd $(TARBALL_PARENT_DIR) && tar cjf $(TARBALL) $(TARBALL_DIR) |