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 27f934acb28bb36efd149466bb1b86dd8f50a2d5..c8cefe1e8ef8c8d0520b3c673e79474f43db1601 100644 (file)
--- a/contrib/shell_utils/Makefile.am
+++ b/contrib/shell_utils/Makefile.am
@@ -3,12 +3,11 @@
 pkgconfdir = @PKGCONFDIR@
 
 GENERATED_FILES = lp2pap.sh
-TEMPLATE_FILES = $(foreach f,$(GENERATED_FILES),$(f).tmpl)
-SCRIPTS = \
-       afpd-mtab.pl                    \
-       apple_cp apple_mv apple_rm      \
-       cleanappledouble.pl             \
-       netatalkshorternamelinks.pl
+TEMPLATE_FILES = lp2pap.sh.tmpl
+PERLSCRIPTS = \
+       afpd-mtab.pl \
+       asip-status.pl \
+       apple_dump
 
 SUFFIXES = .tmpl .
 
@@ -20,6 +19,6 @@ SUFFIXES = .tmpl .
 
 CLEANFILES = $(GENERATED_FILES)
 
-bin_SCRIPTS = $(SCRIPTS) $(GENERATED_FILES)
+bin_SCRIPTS = $(PERLSCRIPTS) $(GENERATED_FILES)
 
-EXTRA_DIST = $(SCRIPTS) $(TEMPLATE_FILES)
+EXTRA_DIST = $(TEMPLATE_FILES)