diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-05-30 00:10:51 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2008-05-30 00:10:51 -0400 |
| commit | 5caee621a217e5693d89dd11a67943600e34e6c3 (patch) | |
| tree | 3e50141658469e04bcdee378a1501545665a62c4 | |
| parent | 2a72db3a22673fc3f732ebdf7c6d5ae3ba75cba6 (diff) | |
| download | plymouth-5caee621a217e5693d89dd11a67943600e34e6c3.tar.gz plymouth-5caee621a217e5693d89dd11a67943600e34e6c3.tar.xz plymouth-5caee621a217e5693d89dd11a67943600e34e6c3.zip | |
Don't run plymouth-update-initrd during distcheck
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | scripts/Makefile.am | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 2c3e11d..17938cb 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 e11303b..7359367 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 f3cc092..0a55191 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 |