[PATCH] Don't install empty starfield directory

[PATCH] Don't install empty starfield directory

[Mike Gilbert]

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

If the starfield theme is disabled, the build system currently creates
an empty directory when you run make install. This confuses
grub-install, which simply checks for -d $pkgdatadir/themes/starfield.

The attached patch avoid creating the empty directory by moving the
definition of starfielddir to within the COND_STARFIELD conditional
block.

[-- Attachment #2: starfielddir.patch --]
[-- Type: text/x-patch, Size: 2007 bytes --]

=== modified file 'Makefile.am'
--- Makefile.am	2012-02-28 11:58:57 +0000
+++ Makefile.am	2012-03-06 00:17:53 +0000
@@ -69,11 +69,10 @@
 starfield_theme_files = $(srcdir)/themes/starfield/blob_w.png $(srcdir)/themes/starfield/boot_menu_c.png $(srcdir)/themes/starfield/boot_menu_e.png $(srcdir)/themes/starfield/boot_menu_ne.png $(srcdir)/themes/starfield/boot_menu_n.png $(srcdir)/themes/starfield/boot_menu_nw.png $(srcdir)/themes/starfield/boot_menu_se.png $(srcdir)/themes/starfield/boot_menu_s.png $(srcdir)/themes/starfield/boot_menu_sw.png $(srcdir)/themes/starfield/boot_menu_w.png $(srcdir)/themes/starfield/slider_c.png $(srcdir)/themes/starfield/slider_n.png $(srcdir)/themes/starfield/slider_s.png $(srcdir)/themes/starfield/starfield.png $(srcdir)/themes/starfield/terminal_box_c.png $(srcdir)/themes/starfield/terminal_box_e.png $(srcdir)/themes/starfield/terminal_box_ne.png $(srcdir)/themes/starfield/terminal_box_n.png $(srcdir)/themes/starfield/terminal_box_nw.png $(srcdir)/themes/starfield/terminal_box_se.png $(srcdir)/themes/starfield/terminal_box_s.png $(srcdir)/themes/starfield/terminal_box_sw.png $(srcdir)/themes/starfield/terminal_box_w.png $(srcdir)/themes/starfield/theme.txt $(srcdir)/themes/starfield/README $(srcdir)/themes/starfield/COPYING.CC-BY-SA-3.0
 
 if COND_STARFIELD
+starfielddir = $(pkgdatadir)/themes/starfield
 starfield_DATA = dejavu.pf2 $(starfield_theme_files)
 dejavu.pf2: $(DJVU_FONT_SOURCE) grub-mkfont
 	$(builddir)/grub-mkfont -o $@ $(DJVU_FONT_SOURCE)
-else
-starfield_DATA = 
 endif
 
 EXTRA_DIST += $(starfield_theme_files)

=== modified file 'conf/Makefile.common'
--- conf/Makefile.common	2012-02-29 15:30:20 +0000
+++ conf/Makefile.common	2012-03-06 00:17:40 +0000
@@ -100,7 +100,6 @@
 
 grubconfdir = $(sysconfdir)/grub.d
 platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
-starfielddir = $(pkgdatadir)/themes/starfield
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
 CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap

Re: [PATCH] Don't install empty starfield directory

[Vladimir 'φ-coder/phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

On 06.03.2012 01:30, Mike Gilbert wrote:
> If the starfield theme is disabled, the build system currently creates
> an empty directory when you run make install. This confuses
> grub-install, which simply checks for -d $pkgdatadir/themes/starfield.
Changed it to

-f $pkgdatadir/themes/starfield/theme.txt

> The attached patch avoid creating the empty directory by moving the
> definition of starfielddir to within the COND_STARFIELD conditional
> block.
>
>
> _______________________________________________
> Grub-devel mailing list
> Grub-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/grub-devel


-- 
Regards
Vladimir 'φ-coder/phcoder' Serbinenko



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 294 bytes --]