The following commit has been merged in the quake branch:
commit 09555129f4c034be1f17b9a99298e67c3a300d2f
Author: Jon Dowland <[email protected]>
Date: Thu Apr 7 17:06:19 2011 +0100
quake: add package abstraction to quake.mk
diff --git a/Makefile b/Makefile
index 6225d4e..53de000 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ default: $(DIRS)
make -f doom-common.mk IWAD=plutonia \
LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION)
make -f quake3.mk LONG="Quake III Arena" VERSION=$(VERSION)
- make -f quake.mk LONG="Quake" VERSION=$(VERSION)
+ make -f quake.mk LONG="Quake" VERSION=$(VERSION) PACKAGE=quake-data
make -f rott.mk VERSION=$(VERSION)
make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
CONTROLIN=heretic/DEBIAN/control.in \
@@ -28,7 +28,7 @@ clean:
make -f doom-common.mk IWAD=plutonia \
LONG="Final Doom: The Plutonia Experiment" VERSION=$(VERSION)
clean
make -f quake3.mk LONG="Quake III Arena" VERSION=$(VERSION) clean
- make -f quake.mk LONG="Quake" VERSION=$(VERSION) clean
+ make -f quake.mk LONG="Quake" VERSION=$(VERSION) clean
PACKAGE=quake-data
make -f rott.mk VERSION=$(VERSION) clean
make -f doom-common.mk IWAD=heretic VERSION=$(VERSION) \
CONTROLIN=heretic/DEBIAN/control.in \
diff --git a/quake-data/DEBIAN/control.in b/quake-common/DEBIAN/control.in
similarity index 96%
rename from quake-data/DEBIAN/control.in
rename to quake-common/DEBIAN/control.in
index 7786a56..875d98f 100644
--- a/quake-data/DEBIAN/control.in
+++ b/quake-common/DEBIAN/control.in
@@ -1,4 +1,4 @@
-Package: quake-data
+Package: PACKAGE
Version: VERSION
Section: non-free/games
Priority: optional
diff --git a/quake-data/copyright.in b/quake-common/copyright.in
similarity index 100%
rename from quake-data/copyright.in
rename to quake-common/copyright.in
diff --git a/quake.mk b/quake.mk
index 1516e86..39133cb 100644
--- a/quake.mk
+++ b/quake.mk
@@ -1,45 +1,45 @@
-# VERSION must be supplied by caller
+# VERSION and PACKAGE must be supplied by caller
srcdir = $(CURDIR)
builddir = $(CURDIR)/build
outdir = $(CURDIR)/out
-QUAKEDEB = $(outdir)/quake-data_$(VERSION)_all.deb
+QUAKEDEB = $(outdir)/$(PACKAGE)_$(VERSION)_all.deb
$(QUAKEDEB): \
- $(builddir)/quake-data/DEBIAN/md5sums \
- $(builddir)/quake-data/DEBIAN/control \
+ $(builddir)/$(PACKAGE)/DEBIAN/md5sums \
+ $(builddir)/$(PACKAGE)/DEBIAN/control \
fixperms
- install -d $(builddir)/quake-data/usr/share/games/quake/id1
+ install -d $(builddir)/$(PACKAGE)/usr/share/games/quake/id1
cd $(builddir) && \
if [ `id -u` -eq 0 ]; then \
- dpkg-deb -b quake-data $@ ; \
+ dpkg-deb -b $(PACKAGE) $@ ; \
else \
- fakeroot dpkg-deb -b quake-data $@ ; \
+ fakeroot dpkg-deb -b $(PACKAGE) $@ ; \
fi
-$(builddir)/quake-data/DEBIAN/md5sums: \
- $(builddir)/quake-data/usr/share/doc/quake-data/changelog.gz \
- $(builddir)/quake-data/usr/share/doc/quake-data/copyright
+$(builddir)/$(PACKAGE)/DEBIAN/md5sums: \
+ $(builddir)/$(PACKAGE)/usr/share/doc/$(PACKAGE)/changelog.gz \
+ $(builddir)/$(PACKAGE)/usr/share/doc/$(PACKAGE)/copyright
install -d `dirname $@`
- cd $(builddir)/quake-data && find usr/ -type f -print0 |\
+ cd $(builddir)/$(PACKAGE) && find usr/ -type f -print0 |\
xargs -0 md5sum >DEBIAN/md5sums
-$(builddir)/quake-data/usr/share/doc/quake-data/changelog.gz:
+$(builddir)/$(PACKAGE)/usr/share/doc/$(PACKAGE)/changelog.gz: debian/changelog
install -d `dirname $@`
gzip -c9 debian/changelog > $@
-$(builddir)/quake-data/usr/share/doc/quake-data/copyright:
+$(builddir)/$(PACKAGE)/usr/share/doc/$(PACKAGE)/copyright:
quake-common/copyright.in
install -d `dirname $@`
- m4 -DPACKAGE=$(PACKAGE) quake-data/copyright.in > $@
+ m4 -DPACKAGE=$(PACKAGE) quake-common/copyright.in > $@
-$(builddir)/quake-data/DEBIAN/control: quake-data/DEBIAN/control.in
+$(builddir)/$(PACKAGE)/DEBIAN/control: quake-common/DEBIAN/control.in
install -d `dirname $@`
- m4 -DVERSION=$(VERSION) < quake-data/DEBIAN/control.in > $@
+ m4 -DVERSION=$(VERSION) < quake-common/DEBIAN/control.in > $@
fixperms:
- find $(builddir)/quake-data -type f -print0 | xargs -0 chmod 644
- find $(builddir)/quake-data -type d -print0 | xargs -0 chmod 755
+ find $(builddir)/$(PACKAGE) -type f -print0 | xargs -0 chmod 644
+ find $(builddir)/$(PACKAGE) -type d -print0 | xargs -0 chmod 755
clean:
- rm -rf $(QUAKEDEB) $(builddir)/quake-data
+ rm -rf $(QUAKEDEB) $(builddir)/$(PACKAGE)
--
Installer for game data files
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
