now can create win32 portable packages

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bb29cd0c02ce9bd61aa72f4363d499e3e4ad9329..f3c3773fa70b7f40aa70e45d32fa50c1e4aeaf1b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,24 +3,29 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = data doc src
 
-EXTRA_DIST = autogen.sh extra
+EXTRA_DIST = autogen.sh extra win32
 
 
-.PHONY: run debug docs package
+.PHONY: run debug docs portable installer
 
 run: all
-       @cd src && $(MAKE) run
+       @$(CD) src && $(MAKE) run
 
 debug: all
-       @cd src && $(MAKE) debug
+       @$(CD) src && $(MAKE) debug
 
 docs:
        $(DOXYGEN)
 
 if WIN32
-package: all
-       @cd win32 && $(MAKE) installer
-else
-package: dist-bzip2
+
+portable: all
+       $(SH) win32/makepackage.sh -p $(prefix) -d "$(DATA_FILES)" \
+               -s $(STRIP) -V $(VERSION)
+
+installer: all
+       $(SH) win32/makepackage.sh -p $(prefix) -d "$(DATA_FILES)" \
+               -s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
+
 endif