From 9619ed3cee0f9e465ad2747fcb4f1f6cb6d3d889 Mon Sep 17 00:00:00 2001 From: Charles McGarvey Date: Mon, 23 Nov 2009 13:52:25 -0700 Subject: [PATCH] fixed win32 installer building --- Makefile.am | 8 ++++---- win32/Makefile.am | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 win32/Makefile.am diff --git a/Makefile.am b/Makefile.am index 0df126f..75f866e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,14 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = data src -EXTRA_DIST = extra - if WIN32 +SUBDIRS = data src else - SUBDIRS += doc +SUBDIRS = data doc src endif +EXTRA_DIST = extra + run: all $(MAKE) -C src run diff --git a/win32/Makefile.am b/win32/Makefile.am new file mode 100644 index 0000000..0cd01df --- /dev/null +++ b/win32/Makefile.am @@ -0,0 +1,11 @@ + +INSTALLER_NAME = yoinksetup-$(VERSION).exe + +.PHONY: installer +installer: + @echo "Building win32 installer..." + @(sh build-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) + -- 2.45.2