r7767 - packages/trunk/game-data-packager

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-18 00:35:41 +0000 (Fri, 18 Jul 2008)
New Revision: 7767

Modified:
   packages/trunk/game-data-packager/doom-common.mk
Log:
directives in correct order

Modified: packages/trunk/game-data-packager/doom-common.mk
===================================================================
--- packages/trunk/game-data-packager/doom-common.mk	2008-07-18 00:27:07 UTC (rev 7766)
+++ packages/trunk/game-data-packager/doom-common.mk	2008-07-18 00:35:41 UTC (rev 7767)
@@ -3,23 +3,21 @@
 
 $(IWAD)DEB=$(IWAD)-wad_$(VERSION)_all.deb
 
-$(IWAD)TARGETS := $(IWAD)-wad/DEBIAN/md5sums $(IWAD)-wad/DEBIAN/control $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz $(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm $(IWAD)-wad/DEBIAN/postinst $(IWAD)-wad/DEBIAN/prerm $(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/README.Debian $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/copyright $(IWAD)DIRS
+$(IWAD)TARGETS := $(IWAD)DIRS $(IWAD)-wad/DEBIAN/control $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/changelog.gz $(IWAD)-wad/usr/share/pixmaps/$(IWAD).xpm $(IWAD)-wad/DEBIAN/postinst $(IWAD)-wad/DEBIAN/prerm $(IWAD)-wad/usr/share/applications/$(IWAD)-wad.desktop $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/README.Debian $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/copyright $(IWAD)-wad/DEBIAN/md5sums 
 
-DIRS := $(IWAD)-wad
+DIRS := \
 	$(IWAD)-wad/DEBIAN \
-	$(IWAD)-wad/usr \
-	$(IWAD)-wad/usr/share \
 	$(IWAD)-wad/usr/share/pixmaps \
 	$(IWAD)-wad/usr/share/applications \
+	$(IWAD)-wad/usr/share/doc/$(IWAD)-wad \
 	$(IWAD)-wad/usr/share/doc \
-	$(IWAD)-wad/usr/share/doc/$(IWAD)-wad \
+	$(IWAD)-wad/usr/share/games/game-data-packager \
+	$(IWAD)-wad/usr/share/games/doom \
 	$(IWAD)-wad/usr/share/games \
-	$(IWAD)-wad/usr/share/games/doom
-	$(IWAD)-wad/usr/share/games/game-data-packager
+	$(IWAD)-wad/usr/share \
+	$(IWAD)-wad/usr \
+	$(IWAD)-wad
 
-$(IWAD)DIRS:
-	mkdir -p $(DIRS)
-
 $($(IWAD)DEB): $($(IWAD)TARGETS) fixperms 
 	if [ `id -u` -eq 0 ]; then \
 		dpkg-deb -b $(IWAD)-wad $@ ; \
@@ -27,6 +25,9 @@
 		fakeroot dpkg-deb -b $(IWAD)-wad $@; \
 	fi
 
+$(IWAD)DIRS:
+	mkdir -p $(DIRS)
+
 $(IWAD)-wad/usr/share/doc/$(IWAD)-wad/copyright:
 	m4 -DPACKAGE=$(IWAD)-wad -DIWAD=$(IWAD).wad \
 		doom-common/usr/share/doc/doom-wad/copyright.in \
@@ -72,6 +73,6 @@
 
 clean:
 	rm -f $($(IWAD)DEB) $($(IWAD)TARGETS)
-	rmdir $(DIRS)
+	-for dir in $(DIRS); do [ -d $$dir ] && rmdir $$dir; done
 
 PHONY: fixperms clean