X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=Makefile.am;h=7f62c7d7dad4f09e8e70be2a5c2d4bd3e6ab35ed;hp=009c2dc467dd72403a4a786a70f81c077649c911;hb=00612586426be6d9a976f141a25ffc1f0d284501;hpb=c9e20ac06383b20ceb5404c9237e319c2e90d157

diff --git a/Makefile.am b/Makefile.am
index 009c2dc..7f62c7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,10 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = data doc src
 
-EXTRA_DIST = extra
+EXTRA_DIST = autogen.sh extra win32
+
+
+.PHONY: run debug docs portable installer
 
 run: all
 	@cd src && $(MAKE) run
@@ -11,16 +14,18 @@ run: all
 debug: all
 	@cd src && $(MAKE) debug
 
-
-.PHONY: docs package
-
 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