From 3ee36a6f7458d44f1197a9d00b51c580033f29a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Thu, 2 Aug 2012 16:52:33 +0200 Subject: [PATCH] distro: don't install initscripts It doesn't make much sense to install initscripts in current distributions. Most of them either don't use initscripts at all, locally patch the initscripts or supply their own. This allows us to eventually drop the --with-distro configure option. Many current distributions support multiple init systems and it doesn't make sense for upstream to make the choice for them. Distributors can still make their scripts copy one of the initscripts from the source tree if they wish so. --- Makefile.am | 1 - configure.ac | 10 ---------- initscript/Arch/Makefile.am | 2 -- initscript/Debian/Makefile.am | 2 -- initscript/Gentoo/Makefile.am | 2 -- initscript/Makefile.am | 28 ---------------------------- initscript/Mandriva/Makefile.am | 3 --- initscript/RedHat/Makefile.am | 6 ------ initscript/SUSE/Makefile.am | 5 ----- initscript/Slackware/Makefile.am | 3 --- initscript/linexa/Makefile.am | 3 --- initscript/paldo/Makefile.am | 3 --- 12 files changed, 68 deletions(-) delete mode 100644 initscript/Arch/Makefile.am delete mode 100644 initscript/Debian/Makefile.am delete mode 100644 initscript/Gentoo/Makefile.am delete mode 100644 initscript/Makefile.am delete mode 100644 initscript/Mandriva/Makefile.am delete mode 100644 initscript/RedHat/Makefile.am delete mode 100644 initscript/SUSE/Makefile.am delete mode 100644 initscript/Slackware/Makefile.am delete mode 100644 initscript/linexa/Makefile.am delete mode 100644 initscript/paldo/Makefile.am diff --git a/Makefile.am b/Makefile.am index 9515dc80d..8a0ad558f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,7 +11,6 @@ SUBDIRS = \ tools \ policy \ data \ - initscript \ test \ po \ man \ diff --git a/configure.ac b/configure.ac index 35ff8c6a8..095fc40f2 100644 --- a/configure.ac +++ b/configure.ac @@ -795,24 +795,14 @@ tools/Makefile cli/Makefile cli/src/Makefile test/Makefile -initscript/Makefile -initscript/RedHat/Makefile initscript/RedHat/NetworkManager -initscript/Gentoo/Makefile initscript/Gentoo/NetworkManager -initscript/Debian/Makefile initscript/Debian/NetworkManager -initscript/Slackware/Makefile initscript/Slackware/rc.networkmanager -initscript/SUSE/Makefile initscript/SUSE/networkmanager -initscript/Arch/Makefile initscript/Arch/networkmanager -initscript/paldo/Makefile initscript/paldo/NetworkManager -initscript/Mandriva/Makefile initscript/Mandriva/networkmanager -initscript/linexa/Makefile initscript/linexa/networkmanager introspection/Makefile introspection/all.xml diff --git a/initscript/Arch/Makefile.am b/initscript/Arch/Makefile.am deleted file mode 100644 index 98d434326..000000000 --- a/initscript/Arch/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -initddir = $(sysconfdir)/rc.d -initd_SCRIPTS = networkmanager diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am deleted file mode 100644 index a73564525..000000000 --- a/initscript/Debian/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -initddir = $(sysconfdir)/init.d -initd_SCRIPTS = NetworkManager diff --git a/initscript/Gentoo/Makefile.am b/initscript/Gentoo/Makefile.am deleted file mode 100644 index a73564525..000000000 --- a/initscript/Gentoo/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -initddir = $(sysconfdir)/init.d -initd_SCRIPTS = NetworkManager diff --git a/initscript/Makefile.am b/initscript/Makefile.am deleted file mode 100644 index 65555e3ef..000000000 --- a/initscript/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -SUBDIRS = -if TARGET_REDHAT -SUBDIRS += RedHat -endif -if TARGET_GENTOO -SUBDIRS += Gentoo -endif -if TARGET_DEBIAN -SUBDIRS += Debian -endif -if TARGET_SLACKWARE -SUBDIRS += Slackware -endif -if TARGET_SUSE -SUBDIRS += SUSE -endif -if TARGET_ARCH -SUBDIRS += Arch -endif -if TARGET_PALDO -SUBDIRS += paldo -endif -if TARGET_MANDRIVA -SUBDIRS += Mandriva -endif -if TARGET_LINEXA -SUBDIRS += linexa -endif diff --git a/initscript/Mandriva/Makefile.am b/initscript/Mandriva/Makefile.am deleted file mode 100644 index bdc990851..000000000 --- a/initscript/Mandriva/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -initddir = $(sysconfdir)/rc.d/init.d -initd_SCRIPTS = networkmanager - diff --git a/initscript/RedHat/Makefile.am b/initscript/RedHat/Makefile.am deleted file mode 100644 index 62f5cf332..000000000 --- a/initscript/RedHat/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -if !HAVE_SYSTEMD - -initddir = $(sysconfdir)/rc.d/init.d -initd_SCRIPTS = NetworkManager - -endif diff --git a/initscript/SUSE/Makefile.am b/initscript/SUSE/Makefile.am deleted file mode 100644 index 4938e3e1d..000000000 --- a/initscript/SUSE/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -# 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. -#initddir = $(sysconfdir)/init.d -#initd_SCRIPTS = networkmanager diff --git a/initscript/Slackware/Makefile.am b/initscript/Slackware/Makefile.am deleted file mode 100644 index 254bb7ad5..000000000 --- a/initscript/Slackware/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -initddir = $(sysconfdir)/rc.d -initd_SCRIPTS = rc.networkmanager - diff --git a/initscript/linexa/Makefile.am b/initscript/linexa/Makefile.am deleted file mode 100644 index bdc990851..000000000 --- a/initscript/linexa/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -initddir = $(sysconfdir)/rc.d/init.d -initd_SCRIPTS = networkmanager - diff --git a/initscript/paldo/Makefile.am b/initscript/paldo/Makefile.am deleted file mode 100644 index 2c1b1964d..000000000 --- a/initscript/paldo/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -initddir = $(sysconfdir)/init.d -initd_SCRIPTS = NetworkManager -