- just warn about disabled master interface, don't silently disable vlans

[projects/rc-scripts.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cadb8d79eec94303cb81d41331c1548b0e172380..202c26c40accd2dcfcc3cfc3747b96178271bf3e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 #      $Id$
 #
 
-SUBDIRS = src ppp isapnp sysconfig rc.d doc man po
+SUBDIRS = src lib ppp isapnp sysconfig rc.d doc man po init
 
 sysconf_DATA = \
        adjtime \
@@ -11,6 +11,9 @@ sysconf_DATA = \
        crypttab \
        sysctl.conf
 
+firmware_SCRIPTS = \
+       firmware-loader.sh
+
 profiledir = @sysconfdir@/profile.d
 
 profile_DATA = \
@@ -26,16 +29,19 @@ sbin_SCRIPTS = \
 EXTRA_DIST = \
        $(sysconf_DATA) \
        $(profile_DATA) \
+       $(firmware_SCRIPTS) \
        $(sbin_SCRIPTS) \
-       $(bin_SCRIPTS) \
-       rc-scripts.spec
+       $(bin_SCRIPTS)
 
 install-data-hook:
        install -d $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)
        [ -f $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)/msg.cache ] || touch $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)/msg.cache
 
+uninstall-hook:
+       [ -f $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)/msg.cache ] && rm -f $(DESTDIR)$(localstatedir)/cache/$(PACKAGE)/msg.cache
+
 # make rpms
 rpm: $(PACKAGE).spec
        $(MAKE) dist
-       rpmbin=`LANG=C LC_ALL=C rpm -ta 2>&1 | grep -q "unknown option" && echo rpmbuild || echo rpm` ; \
+       rpmbin=`LC_ALL=C rpm -ta 2>&1 | grep -q "unknown option" && echo rpmbuild || echo rpm` ; \
                $$rpmbin -ta --clean --rmsource $(PACKAGE)-$(VERSION).tar.gz