X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=Makefile.am;fp=Makefile.am;h=f3c3773fa70b7f40aa70e45d32fa50c1e4aeaf1b;hp=bb29cd0c02ce9bd61aa72f4363d499e3e4ad9329;hb=0b8dbc2d02c7f78d273ad9cfdf05c927c648ffd1;hpb=6c47a7028f7c72fabc40f417aa41111c28de8a84

diff --git a/Makefile.am b/Makefile.am
index bb29cd0..f3c3773 100644
--- 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