From b3ea581e61d4ecfc5b52c342283bf17ca3498a5d Mon Sep 17 00:00:00 2001 From: Dennis Schridde Date: Fri, 20 Feb 2009 15:25:57 +0000 Subject: [PATCH] Fix wrong dependency in win32 data creation, and use correct names after dir rename git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6668 4a71c877-e1ca-e34f-864e-861f7616d084 --- data/makefile.win32 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/makefile.win32 b/data/makefile.win32 index 228dc2248..659623ed0 100644 --- a/data/makefile.win32 +++ b/data/makefile.win32 @@ -25,7 +25,7 @@ BASELIST= \ texpages \ wrf -PATCHLIST= \ +MPLIST= \ addon.lev \ anims \ components \ @@ -37,17 +37,17 @@ PATCHLIST= \ wrf BASEARCHIVE=base.wz -PATCHARCHIVE=mp.wz +MPARCHIVE=mp.wz -CLEANFILES=$(BASEARCHIVE) $(PATCHARCHIVE) +CLEANFILES=$(BASEARCHIVE) $(MPARCHIVE) include $(top_srcdir)/makerules/submake.mk -.PHONY: all clean $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS) +.PHONY: all clean $(BASEARCHIVE) $(MPARCHIVE) $(SUBDIRS) all: ifdef INSTALLER -all: $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS) +all: $(BASEARCHIVE) $(MPARCHIVE) $(SUBDIRS) endif stamp: @@ -58,11 +58,11 @@ $(BASEARCHIVE): $(basename $(BASEARCHIVE)) stamp $(patsubst %,$(basename $(BASEA zip -T $@ $(RM_F) stamp -$(PATCHARCHIVE): $(basename $(BASEARCHIVE)) stamp $(patsubst %,$(basename $(PATCHARCHIVE))/%,$(PATCHLIST)) +$(MPARCHIVE): $(basename $(MPARCHIVE)) stamp $(patsubst %,$(basename $(MPARCHIVE))/%,$(MPLIST)) (cd $< && zip -ru0 $@ $(filter-out stamp,$(filter-out $<,$(^:$