Avoid installing files that aren't packaged (glen).

svn-id: @7390

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b645eb31dce847d14c27076d37c7cf8ab2047618..fae11562f195919741e26da74b9c4e1ab5918300 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,9 +2,10 @@
 
 docdir = @docdir@
 
-doc_DATA = \
+doc_DATA = 
+noinst_DATA = \
        net-scripts.txt \
        sysconfig.txt \
        sysvinitfiles
 
-EXTRA_DIST = $(doc_DATA)
+EXTRA_DIST = $(doc_DATA) $(noinst_DATA)

diff --git a/sysconfig/Makefile.am b/sysconfig/Makefile.am
index 1ab3f9574fbc45f624f5a732f2c1f94c500e6ed3..ce7679895ba2c42a02d351dd16107e8e0c5eaafd 100644 (file)
--- a/sysconfig/Makefile.am
+++ b/sysconfig/Makefile.am
@@ -7,7 +7,6 @@ sysconfigdir = @sysconfigdir@
 sysconfig_DATA = \
        clock \
        init-colors \
-       init-colors.gentoo \
        hwprof \
        system \
        network \
@@ -17,4 +16,7 @@ sysconfig_DATA = \
        i18n \
        timezone
 
-EXTRA_DIST = $(sysconfig_DATA)
+noinst_DATA = \
+       init-colors.gentoo
+
+EXTRA_DIST = $(sysconfig_DATA) $(noinst_DATA)

diff --git a/sysconfig/hwprofiles/Makefile.am b/sysconfig/hwprofiles/Makefile.am
index e52e08ce1b9f1a24ccc8c4cbc8bae750c7e80cdf..6149d2b08fa2e67c32d2bfdfb3809d3f5d62068f 100644 (file)
--- a/sysconfig/hwprofiles/Makefile.am
+++ b/sysconfig/hwprofiles/Makefile.am
@@ -2,7 +2,8 @@
 
 hwprofilesdir = @sysconfigdir@/hwprofiles
 
-hwprofiles_DATA = \
-                 files
+hwprofiles_DATA = 
+noinst_DATA = \
+       files
                          
-EXTRA_DIST = $(hwprofiles_DATA)
+EXTRA_DIST = $(hwprofiles_DATA) $(noinst_DATA)

diff --git a/sysconfig/interfaces/Makefile.am b/sysconfig/interfaces/Makefile.am
index 205e1a589457b94ae6f3a262c2c6b635363ed4bf..404cc72107b3f367706c5bdcd9bb1e5303a9a8d5 100644 (file)
--- a/sysconfig/interfaces/Makefile.am
+++ b/sysconfig/interfaces/Makefile.am
@@ -4,10 +4,11 @@ SUBDIRS = data up.d down.d
 
 interfacesdir = @sysconfigdir@/interfaces
 
-interfaces_DATA = \
+interfaces_DATA = ifcfg-eth0
+
+noinst_DATA = \
        ifcfg-br0 \
        ifcfg-description \
-       ifcfg-eth0 \
        ifcfg-eth0.1 \
        ifcfg-irda0 \
        ifcfg-irlan0 \
@@ -24,4 +25,4 @@ interfaces_DATA = \
        tnlcfg-icm 
 
 
-EXTRA_DIST = $(interfaces_DATA)
+EXTRA_DIST = $(interfaces_DATA) $(noinst_DATA)

diff --git a/sysconfig/interfaces/data/Makefile.am b/sysconfig/interfaces/data/Makefile.am
index 2ada005464e7f3db85d983d81b7fdb19f1d3c9cd..5ff135a91eaa5410ab319b0e9036f33934928013 100644 (file)
--- a/sysconfig/interfaces/data/Makefile.am
+++ b/sysconfig/interfaces/data/Makefile.am
@@ -2,10 +2,12 @@
 
 interfacesdatadir = @sysconfigdir@/interfaces/data
 
-interfacesdata_DATA = \
+interfacesdata_DATA = 
+
+noinst_DATA = \
        chat-ppp0.callback \
        chat-ppp0.leased1 \
        chat-ppp0.tpsa \
        chat-ppp0.gprs-plusgsm
 
-EXTRA_DIST = $(interfacesdata_DATA)
+EXTRA_DIST = $(interfacesdata_DATA) $(noinst_DATA)

diff --git a/sysconfig/interfaces/down.d/all/Makefile.am b/sysconfig/interfaces/down.d/all/Makefile.am
index 6164991ceeae03eecfbec605cf811718139cc697..89e512c0bb2dda489d7b9f497cc98a61411c6531 100644 (file)
--- a/sysconfig/interfaces/down.d/all/Makefile.am
+++ b/sysconfig/interfaces/down.d/all/Makefile.am
@@ -2,6 +2,7 @@
 
 alldowndir= @downdir@/all
 
-alldown_SCRIPTS = thetouch
+alldown_SCRIPTS =
+noinst_SCRIPTS =  thetouch
 
-EXTRA_DIST = $(alldown_SCRIPTS)
+EXTRA_DIST = $(alldown_SCRIPTS) $(noinst_SCRIPTS)

diff --git a/sysconfig/interfaces/up.d/all/Makefile.am b/sysconfig/interfaces/up.d/all/Makefile.am
index 4b954862ddff8306bd0a6d7c24eb3793c53545f1..3bd6864fc8014fbb5f6f0ef3badf89d7f967beb3 100644 (file)
--- a/sysconfig/interfaces/up.d/all/Makefile.am
+++ b/sysconfig/interfaces/up.d/all/Makefile.am
@@ -2,6 +2,7 @@
 
 allupdir = @updir@/all
 
-allup_SCRIPTS = thetouch
+allup_SCRIPTS = 
+noinst_SCRIPTS = thetouch
 
-EXTRA_DIST = $(allup_SCRIPTS)
+EXTRA_DIST = $(allup_SCRIPTS) $(noinst_SCRIPTS)