new convenient script methods

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bb29cd0c02ce9bd61aa72f4363d499e3e4ad9329..7f62c7d7dad4f09e8e70be2a5c2d4bd3e6ab35ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,10 @@ 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
@@ -18,9 +18,14 @@ 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