Am 20.03.2011 10:45, schrieb Michael Biebl: > Am 20.03.2011 10:39, schrieb Michael Biebl: >> 2/ We should only ship the input files for the SysV init scripts in the tarball, >> not the generated files. Patch attached. > > Looking at this a second time, given that all init scripts are generated via > AC_CONFIG_FILES(), there is not point really adding > > EXTRA_DIST = foo.in > DISTCLEANFILES = foo > > in initscript/*/Makefile.am. This can be dropped. Updated patch attached -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
From abe72573b1ae8eee8fc1fcad5221cc7b4b40e401 Mon Sep 17 00:00:00 2001 From: Michael Biebl <biebl debian org> Date: Sun, 20 Mar 2011 10:23:02 +0100 Subject: [PATCH] Only ship input files for SysV init scripts in dist tarball And let AC_CONFIG_FILES() take care of including them --- initscript/Arch/Makefile.am | 3 --- initscript/Debian/Makefile.am | 3 --- initscript/Gentoo/Makefile.am | 3 --- initscript/Mandriva/Makefile.am | 3 --- initscript/RedHat/Makefile.am | 3 --- initscript/SUSE/Makefile.am | 3 --- initscript/Slackware/Makefile.am | 3 --- initscript/linexa/Makefile.am | 3 --- initscript/paldo/Makefile.am | 3 --- 9 files changed, 0 insertions(+), 27 deletions(-) diff --git a/initscript/Arch/Makefile.am b/initscript/Arch/Makefile.am index 2c1f8b5..98d4343 100644 --- a/initscript/Arch/Makefile.am +++ b/initscript/Arch/Makefile.am @@ -1,5 +1,2 @@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager - initddir = $(sysconfdir)/rc.d initd_SCRIPTS = networkmanager diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am index 890ed77..a735645 100644 --- a/initscript/Debian/Makefile.am +++ b/initscript/Debian/Makefile.am @@ -1,5 +1,2 @@ -EXTRA_DIST = NetworkManager.in -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/Gentoo/Makefile.am b/initscript/Gentoo/Makefile.am index af023b7..a735645 100644 --- a/initscript/Gentoo/Makefile.am +++ b/initscript/Gentoo/Makefile.am @@ -1,5 +1,2 @@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/Mandriva/Makefile.am b/initscript/Mandriva/Makefile.am index 0a0cc2b..bdc9908 100644 --- a/initscript/Mandriva/Makefile.am +++ b/initscript/Mandriva/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager - initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager diff --git a/initscript/RedHat/Makefile.am b/initscript/RedHat/Makefile.am index 3f7b876..fc97ec4 100644 --- a/initscript/RedHat/Makefile.am +++ b/initscript/RedHat/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/SUSE/Makefile.am b/initscript/SUSE/Makefile.am index 75a7c2a..4938e3e 100644 --- a/initscript/SUSE/Makefile.am +++ b/initscript/SUSE/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = networkmanager.in -DISTCLEANFILES = networkmanager - # Nowadays, NetworkManager support is built-in to the SUSE networking # subsystem, therefore a SUSE machine does not want these scripts. Uncomment # this if you actually want external initscripts, such as SUSE 10.0 or earlier. diff --git a/initscript/Slackware/Makefile.am b/initscript/Slackware/Makefile.am index ded3ee0..254bb7a 100644 --- a/initscript/Slackware/Makefile.am +++ b/initscript/Slackware/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = rc.networkmanager -DISTCLEANFILES = rc.networkmanager - initddir = $(sysconfdir)/rc.d initd_SCRIPTS = rc.networkmanager diff --git a/initscript/linexa/Makefile.am b/initscript/linexa/Makefile.am index 0a0cc2b..bdc9908 100644 --- a/initscript/linexa/Makefile.am +++ b/initscript/linexa/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager - initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager diff --git a/initscript/paldo/Makefile.am b/initscript/paldo/Makefile.am index 3d67ff6..2c1b196 100644 --- a/initscript/paldo/Makefile.am +++ b/initscript/paldo/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager -- 1.7.4.1
Attachment:
signature.asc
Description: OpenPGP digital signature