build-sys: fix MKDIR_P for recent automake

[catta] / avahi-autoipd / Makefile.am

diff --git a/avahi-autoipd/Makefile.am b/avahi-autoipd/Makefile.am
index eb6c3f8b4b9eb1590ca763a5c56f53c85d0ad614..56f7a355834f53d7ae92a9247c2acfff9b0d808f 100644 (file)
--- a/avahi-autoipd/Makefile.am
+++ b/avahi-autoipd/Makefile.am
@@ -1,7 +1,5 @@
-# $Id$
-#
 # This file is part of avahi.
-# 
+#
 # avahi is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2 of the
@@ -50,14 +48,14 @@ else
 avahi_autoipd_SOURCES += iface-linux.c
 endif
 
-pkgsysconf_SCRIPTS=avahi-autoipd.action
+nodist_pkgsysconf_SCRIPTS = avahi-autoipd.action
 
 if TARGET_FREEBSD
 avahi-autoipd.action: avahi-autoipd.action.bsd
-       cp $< $@
+       $(AM_V_GEN)cp $< $@
 else
 avahi-autoipd.action: avahi-autoipd.action.linux
-       cp $< $@
+       $(AM_V_GEN)cp $< $@
 endif
 
 if TARGET_DEBIAN
@@ -65,20 +63,20 @@ if TARGET_DEBIAN
 noinst_SCRIPTS = dhclient-enter-hook dhclient-exit-hook
 
 dhclient-enter-hook: dhclient-enter-hook.in
-       sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+       $(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' $< > $@ && \
        chmod +x $@
 
 dhclient-exit-hook: dhclient-exit-hook.in
-       sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+       $(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' $< > $@ && \
        chmod +x $@
 
 BUILD = dhclient-exit-hook dhclient-enter-hook
 
-dhcliententerdir = $(sysconfdir)/dhcp3/dhclient-enter-hooks.d
-dhclientexitdir = $(sysconfdir)/dhcp3/dhclient-exit-hooks.d
+dhcliententerdir = $(sysconfdir)/dhcp/dhclient-enter-hooks.d
+dhclientexitdir = $(sysconfdir)/dhcp/dhclient-exit-hooks.d
 
 install-exec-hook: dhclient-exit-hook dhclient-enter-hook
-       $(mkdir_p) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
+       $(MKDIR_P) $(DESTDIR)$(dhcliententerdir) $(DESTDIR)$(dhclientexitdir)
        $(INSTALL) dhclient-enter-hook $(DESTDIR)$(dhcliententerdir)/avahi-autoipd
        $(INSTALL) dhclient-exit-hook $(DESTDIR)$(dhclientexitdir)/avahi-autoipd
 
@@ -91,6 +89,6 @@ endif
 endif
 endif
 
-EXTRA_DIST=avahi-autoipd.action dhclient-enter-hook.in dhclient-exit-hook.in avahi-autoipd.action.linux avahi-autoipd.action.bsd
+EXTRA_DIST = dhclient-enter-hook.in dhclient-exit-hook.in avahi-autoipd.action.linux avahi-autoipd.action.bsd
 
-CLEANFILES=dhclient-enter-hook dhclient-exit-hook avahi-autoipd.action
+CLEANFILES = dhclient-enter-hook dhclient-exit-hook avahi-autoipd.action