bugfix: service and name swapped

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b8f74200619110b574c312cd191ee1300a96fcc0..cc0d5323aec3626cb573a08dd63a2cde036ce72c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,43 +1,42 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc src extra
+SUBDIRS = data src
+EXTRA_DIST = autogen.sh doc
 
+man6_MANS = doc/yoink.6
 
-run: all
-       $(MAKE) -C src run
-
-debug: all
-       $(MAKE) -C src debug
 
+.PHONY: run debug portable installer package
 
 if WIN32
 
-INSTALLER_NAME = yoinksetup-$(VERSION).exe
+portable: all
+       $(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION)
 
-.PHONY: package
-package: $(INSTALLER_NAME)
+if HAVE_MAKENSIS
 
-$(INSTALLER_NAME): all
-       @echo "Creating win32 installer..."
-       @(sh make-win32-installer.sh $(INSTALLER_NAME) 2> installer.log 1>&2 && \
-         rm installer.log && echo "Done.") || \
-       (echo "Installer compilation failed!"; \
-        echo "Check installer.log for details."; exit 1)
+installer: all
+       $(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
+               -s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
+
+endif
 
 else
-if LINUX
 
-.PHONY: package
-package: rpm
+run: all
+       @cd src && $(MAKE) run
 
-rpm: dist-bzip2
-       @echo "Creating RPM package..."
-       @($(RPMBUILD) -ba --nodeps extra/yoink.spec 2> rpmbuild.log 1>&2 && \
-               rm rpmbuild.log && echo "Done.") || \
-               (echo "rpmbuild failed!"; \
-               echo "Check rpmbuild.log for details."; exit 1)
+debug: all
+       @cd src && $(MAKE) debug
 
 endif
+
+if NETBSD
+
+package: all
+       $(SH) arch/netbsd/makepackage.sh
+
 endif