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-861f7616d084master
parent
8e3bd16a4d
commit
b3ea581e61
|
@ -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 $<,$(^:$</%=%))) -x '*svn*' -x '*Makefile*' || [ $$? -eq 12 ] && true) # zip returns 12 on "nothing to do"
|
||||
zip -T $@
|
||||
$(RM_F) stamp
|
||||
|
||||
clean: $(SUBDIRS)
|
||||
$(RM_F) $(BASEARCHIVE)
|
||||
$(RM_F) $(PATCHARCHIVE)
|
||||
$(RM_F) $(MPARCHIVE)
|
||||
|
|
Loading…
Reference in New Issue