repository reorganizing

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bb29cd0c02ce9bd61aa72f4363d499e3e4ad9329..36d5fab3c44f9f2cddca51431bbf5580ae78207b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,19 @@ SUBDIRS = data doc src
 EXTRA_DIST = autogen.sh extra
 
 
-.PHONY: run debug docs package
+.PHONY: run debug docs portable installer
+
+if WIN32
+
+portable: all
+       $(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION)
+
+installer: all
+       $(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
+
+else
 
 run: all
        @cd src && $(MAKE) run
@@ -14,13 +26,8 @@ run: all
 debug: all
        @cd src && $(MAKE) debug
 
+endif
+
 docs:
        $(DOXYGEN)
 
-if WIN32
-package: all
-       @cd win32 && $(MAKE) installer
-else
-package: dist-bzip2
-endif
-