Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Get grim.wz from data/mods/global/grim.wz instead of data/grim.wz for the NSIS installers 

* Fix data/Makefile.raw by moving make-target/make-rule $(SUBDIRS) below "all"

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2406 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-08-17 18:31:35 +00:00
parent 94db796167
commit 8fbf62c1b2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/Makefile.raw
View File

@ -1,8 +1,5 @@
SUBDIRS=mods SUBDIRS=mods
$(SUBDIRS):
$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
MAKERULES=../makerules MAKERULES=../makerules
include $(MAKERULES)/configure.mk include $(MAKERULES)/configure.mk
@ -20,6 +17,9 @@ ifdef DATA
all: $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS) all: $(BASEARCHIVE) $(PATCHARCHIVE) $(SUBDIRS)
endif endif
$(SUBDIRS):
$(MAKE) -f Makefile.raw -C $@ $(MAKECMDGOALS)
$(BASEARCHIVE): $(BASELIST) $(BASEARCHIVE): $(BASELIST)
zip -ru0 $@ $(BASELIST) -x *svn* zip -ru0 $@ $(BASELIST) -x *svn*
zip -T $@ zip -T $@

2
nsis/warzone2100.nsi
View File

@ -196,7 +196,7 @@ Section $(TEXT_SecGrimMod) SecGrimMod
SetOutPath "$INSTDIR\mods\global" SetOutPath "$INSTDIR\mods\global"
File "..\data\grim.wz" File "..\data\mods\global\grim.wz"
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"

2
nsis/warzone2100.update.nsi
View File

@ -207,7 +207,7 @@ Section $(TEXT_SecGrimMod) SecGrimMod
SetOutPath "$INSTDIR\mods\global" SetOutPath "$INSTDIR\mods\global"
; File "..\data\grim.wz" ; File "..\data\mods\global\grim.wz"
; !insertmacro VPatchFile "grim.wz.vpatch" "$INSTDIR\grim.wz" "$INSTDIR\grim.wz.tmp" ; !insertmacro VPatchFile "grim.wz.vpatch" "$INSTDIR\grim.wz" "$INSTDIR\grim.wz.tmp"
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"