Merge branch 'master' into cooking

[xonotic/gmqcc.git] / distro / deb / Makefile

diff --git a/distro/deb/Makefile b/distro/deb/Makefile
index 77f9b2c4107e4664a79b205443666625fd62218b..535cf1cdabaa1b1ad511824fa1a1d53686da7a35 100644 (file)
--- a/distro/deb/Makefile
+++ b/distro/deb/Makefile
@@ -1,8 +1,5 @@
 BASEDIR := ../..
-PREFIX  := usr
-BINDIR  := $(PREFIX)/bin
-DATADIR := $(PREFIX)/share
-MANDIR  := $(DATADIR)/man
+PREFIX  := /usr
 HEADER  := $(BASEDIR)/gmqcc.h
 MAJOR   := `sed -n -e '/GMQCC_VERSION_MAJOR/{s/.* .* //;p;q;}' $(HEADER)`
 MINOR   := `sed -n -e '/GMQCC_VERSION_MINOR/{s/.* .* //;p;q;}' $(HEADER)`
@@ -11,18 +8,16 @@ DEBDIR  := gmqcc-$(MAJOR).$(MINOR).$(PATCH)
 DEB     := $(DEBDIR).deb
 
 base:
-       $(MAKE) -C $(BASEDIR) DESTDIR=distro/deb/$(DEBDIR)/ PREFIX=/usr install
-       @install -d m755 $(DEBDIR)/DEBIAN
-       @cp        control                $(DEBDIR)/DEBIAN/
-
-       @tar czf data.tar.gz $(DEBDIR)/[a-z]*
-       @tar czf control.tar.gz $(DEBDIR)/DEBIAN/*
+       $(MAKE) -C $(BASEDIR) DESTDIR=distro/deb/$(DEBDIR) PREFIX=$(PREFIX) install
+       @install -d -m755 $(DEBDIR)/DEBIAN
+       @cp       control $(DEBDIR)/DEBIAN/control
+       @tar czf data.tar.gz -C $(DEBDIR)/ . --exclude=DEBIAN
+       @tar czf control.tar.gz -C $(DEBDIR)/DEBIAN/ .
        @echo 2.0 > debian-binary
        @ar r $(DEB) debian-binary control.tar.gz data.tar.gz
-       @rm -rf $(DEBDIR) debian-binary control.tar.gz data.tar.gz
-
+       @rm -rf debian-binary control.tar.gz data.tar.gz $(DEBDIR)
 clean:
-       @rm $(DEB)
+       @rm -f $(DEB)
 
 
 all: base