add GRUB_WINDOWS_EXTRA_DIST to allow shipping runtime files

Not all toolkits provide static libraries. This patch enables creation of self
contained distribution that does not require pre-existing runtime libraries.
Intended usage is

export GRUB_WINDOWS_EXTRA_DIST="/path/to/liblzma.dll /path/to/libintl.dll"
make
make windowszip

As those libraries and locations are dependent on toolchain in use, trying
to autodetect them is likely impossible. So just provide a simple way to
package everything in one step.

Also remove $(windowsdir) after ZIP was created same as other "make dist"
targets.

diff --git a/ChangeLog b/ChangeLog
index 3ba57aed842acc4b9961e551e5c6fe8394ab04e2..1ede37091652e3a222a04d19a59c216e75398eef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-21  Andrey Borzenkov <arvidjaar@gmail.com>
+
+       * Makefile.am: Allow adding extra files to generated Windows ZIP
+       archive by setting GRUB_WINDOWS_EXTRA_DIST.
+
 2014-01-21  Andrey Borzenkov <arvidjaar@gmail.com>
 
        * configure.ac: Look for DejaVuSans also in /usr/share/fonts/truetype.

diff --git a/Makefile.am b/Makefile.am
index 97c062d7d35f5348f81f1d666527537a73a72fc1..f02ae0a393c0562468043fd3abb1f11c3ff73ad7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -420,10 +420,14 @@ windowsdir: $(PROGRAMS) $(starfield_DATA) $(platform_DATA)
        for x in $(starfield_DATA); do \
                cp -fp $$x $(windowsdir)/themes/starfield/$$(basename $$x); \
        done
+       for x in $(GRUB_WINDOWS_EXTRA_DIST); do \
+               cp -fp $$x $(windowsdir); \
+       done
 
 windowszip=$(top_builddir)/$(PACKAGE)-$(VERSION)-for-windows.zip
 windowszip: windowsdir
        test -f $(windowszip) && rm $(windowszip) || true
        zip -r $(windowszip) $(windowsdir)
+       rm -rf $(windowsdir)
 
 EXTRA_DIST += linguas.sh