rc-scripts/trunk: doc/Makefile.am sysconfig/Makefile.am sysconfig/hwprofiles/Makefile.am sysconfig/i...

arekm cvs at pld-linux.org
Sun May 7 19:19:06 CEST 2006


Author: arekm
Date: Sun May  7 19:18:51 2006
New Revision: 7390

Modified:
   rc-scripts/trunk/doc/Makefile.am
   rc-scripts/trunk/sysconfig/Makefile.am
   rc-scripts/trunk/sysconfig/hwprofiles/Makefile.am
   rc-scripts/trunk/sysconfig/interfaces/Makefile.am
   rc-scripts/trunk/sysconfig/interfaces/data/Makefile.am
   rc-scripts/trunk/sysconfig/interfaces/down.d/all/Makefile.am
   rc-scripts/trunk/sysconfig/interfaces/up.d/all/Makefile.am
Log:
Avoid installing files that aren't packaged (glen).


Modified: rc-scripts/trunk/doc/Makefile.am
==============================================================================
--- rc-scripts/trunk/doc/Makefile.am	(original)
+++ rc-scripts/trunk/doc/Makefile.am	Sun May  7 19:18:51 2006
@@ -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)

Modified: rc-scripts/trunk/sysconfig/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/Makefile.am	(original)
+++ rc-scripts/trunk/sysconfig/Makefile.am	Sun May  7 19:18:51 2006
@@ -7,7 +7,6 @@
 sysconfig_DATA = \
 	clock \
 	init-colors \
-	init-colors.gentoo \
 	hwprof \
 	system \
 	network \
@@ -17,4 +16,7 @@
 	i18n \
 	timezone
 
-EXTRA_DIST = $(sysconfig_DATA)
+noinst_DATA = \
+	init-colors.gentoo
+
+EXTRA_DIST = $(sysconfig_DATA) $(noinst_DATA)

Modified: rc-scripts/trunk/sysconfig/hwprofiles/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/hwprofiles/Makefile.am	(original)
+++ rc-scripts/trunk/sysconfig/hwprofiles/Makefile.am	Sun May  7 19:18:51 2006
@@ -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)

Modified: rc-scripts/trunk/sysconfig/interfaces/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/Makefile.am	(original)
+++ rc-scripts/trunk/sysconfig/interfaces/Makefile.am	Sun May  7 19:18:51 2006
@@ -4,10 +4,11 @@
 
 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 @@
 	tnlcfg-icm 
 
 
-EXTRA_DIST = $(interfaces_DATA)
+EXTRA_DIST = $(interfaces_DATA) $(noinst_DATA)

Modified: rc-scripts/trunk/sysconfig/interfaces/data/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/data/Makefile.am	(original)
+++ rc-scripts/trunk/sysconfig/interfaces/data/Makefile.am	Sun May  7 19:18:51 2006
@@ -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)

Modified: rc-scripts/trunk/sysconfig/interfaces/down.d/all/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/down.d/all/Makefile.am	(original)
+++ rc-scripts/trunk/sysconfig/interfaces/down.d/all/Makefile.am	Sun May  7 19:18:51 2006
@@ -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)

Modified: rc-scripts/trunk/sysconfig/interfaces/up.d/all/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/up.d/all/Makefile.am	(original)
+++ rc-scripts/trunk/sysconfig/interfaces/up.d/all/Makefile.am	Sun May  7 19:18:51 2006
@@ -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)


More information about the pld-cvs-commit mailing list