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 bf4c91a3ef8c3aaf65343579f7e8afec985e55f2..c8cefe1e8ef8c8d0520b3c673e79474f43db1601 100644 (file)
--- a/contrib/shell_utils/Makefile.am
+++ b/contrib/shell_utils/Makefile.am
@@ -2,17 +2,23 @@
 
 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:@${pkgconfdir}@ \
-               <$^ >$@
+               <$< >$@
 
-CLEANFILES = lp2pap.sh
+CLEANFILES = $(GENERATED_FILES)
 
-bin_SCRIPTS = apple_cp apple_mv apple_rm cleanappledouble.pl lp2pap.sh \
-       netatalkshorternamelinks.pl afpd-mtab.pl
+bin_SCRIPTS = $(PERLSCRIPTS) $(GENERATED_FILES)
 
-EXTRA_DIST = $(bin_SCRIPTS)
+EXTRA_DIST = $(TEMPLATE_FILES)