Fix fce merge conflict

[netatalk.git] / contrib / shell_utils / Makefile.am

diff --git a/contrib/shell_utils/Makefile.am b/contrib/shell_utils/Makefile.am
index 332ece794732825f73da99c2becc3ce1f2c40762..c8cefe1e8ef8c8d0520b3c673e79474f43db1601 100644 (file)
--- a/contrib/shell_utils/Makefile.am
+++ b/contrib/shell_utils/Makefile.am
@@ -1,13 +1,24 @@
 # Makefile for contrib/shell_utils/
 
+pkgconfdir = @PKGCONFDIR@
+
+GENERATED_FILES = lp2pap.sh
+TEMPLATE_FILES = lp2pap.sh.tmpl
+PERLSCRIPTS = \
+       afpd-mtab.pl \
+       asip-status.pl \
+       apple_dump
+
 SUFFIXES = .tmpl .
 
 .tmpl:
        sed -e s@:BINDIR:@${bindir}@ \
                -e s@:SBINDIR:@${sbindir}@ \
-               -e s@:ETCDIR:@${CONFIG_DIR}@ \
-               <$^ >$@
+               -e s@:ETCDIR:@${pkgconfdir}@ \
+               <$< >$@
+
+CLEANFILES = $(GENERATED_FILES)
 
-CLEANFILES = lp2pap.sh
+bin_SCRIPTS = $(PERLSCRIPTS) $(GENERATED_FILES)
 
-bin_SCRIPTS = apple_cp apple_mv apple_rm lp2pap.sh
+EXTRA_DIST = $(TEMPLATE_FILES)