From: Ray Strode Date: Fri, 30 May 2008 04:10:51 +0000 (-0400) Subject: Don't run plymouth-update-initrd during distcheck X-Git-Tag: 0.1.0~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5caee621a217e5693d89dd11a67943600e34e6c3;p=thirdparty%2Fplymouth.git Don't run plymouth-update-initrd during distcheck --- diff --git a/Makefile.am b/Makefile.am index 2c3e11df..17938cb8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = src scripts +DISTCHECK_CONFIGURE_FLAGS = --without-boot-entry EXTRA_DIST = ChangeLog \ README diff --git a/configure.ac b/configure.ac index e11303bb..73593670 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,10 @@ if test x$enable_tracing = xyes; then AC_DEFINE(PLY_ENABLE_TRACING, 1, [Build in verbose debug tracing spew]) fi +AC_ARG_WITH(boot-entry, AS_HELP_STRING([--with-boot-entry],[create initrd and grub entry]),with_boot_entry=$withval,with_boot_entry=yes) + +AM_CONDITIONAL(ADD_BOOT_ENTRY, [test "$with_boot_entry" = yes]) + AC_ARG_WITH(logo, AC_HELP_STRING([--with-logo], [logo used by boot splash plugins]),logofile=${withval},logofile=$datadir/pixmaps/system-logo-white.png) AC_SUBST(logofile) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index f3cc0927..0a551917 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -3,8 +3,10 @@ noinst_SCRIPTS = new-object.sh initrdscriptdir = $(libexecdir)/plymouth initrdscript_SCRIPTS = plymouth-update-initrd -install-data-hook: - $(DESTDIR)$(initrdscriptdir)/plymouth-update-initrd +if ADD_BOOT_ENTRY +install-data-hook: + $(initrdscriptdir)/plymouth-update-initrd +endif EXTRA_DIST=$(initrdscript_SCRIPTS) $(noinst_SCRIPTS) default.cfg MAINTAINERCLEANFILES = Makefile.in