Do not distribute generated files.

diff --git a/NEWS b/NEWS
index 1112a35389572818b4aac21a1011ff9f4ec6f712..5b0b402c4c4446f382e8728058ab4d960529a938 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Changes in 1.6.3
 ================
 
 * FIX: afpd: Files could be opened for writing on read-only filesystems.
+* FIX: shell_utils: Don't distribute generated files.
 
 Changes in 1.6.2
 ================

diff --git a/configure.in b/configure.in
index f6d9b91fd15a617a28250309d5b8b3654b0feddd..06019156748b44b5d1f7eb143428a50b79e11949 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.168.2.5 2003-02-08 03:16:52 jmarcus Exp $
+dnl $Id: configure.in,v 1.168.2.6 2003-06-06 17:24:00 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -682,6 +682,7 @@ AC_OUTPUT([Makefile
        contrib/shell_utils/apple_mv
        contrib/shell_utils/apple_rm
        contrib/shell_utils/cleanappledouble.pl
+       contrib/shell_utils/lp2pap.sh
        contrib/shell_utils/netatalkshorternamelinks.pl
        contrib/timelord/Makefile
        distrib/Makefile

diff --git a/contrib/shell_utils/Makefile.am b/contrib/shell_utils/Makefile.am
index dabbc23e27de4a8a22f85d568d05feb685b95da8..6584ae14f1b1bfcf71f472b7294fe9a2548046e7 100644 (file)
--- a/contrib/shell_utils/Makefile.am
+++ b/contrib/shell_utils/Makefile.am
@@ -2,24 +2,16 @@
 
 pkgconfdir = @PKGCONFDIR@
 
-GENERATED_FILES = lp2pap.sh
-TEMPLATE_FILES = $(foreach f,$(GENERATED_FILES),$(f).tmpl)
-PERLSCRIPTS = \
+GENERATED_FILES = \
        afpd-mtab.pl                    \
        apple_cp apple_mv apple_rm      \
        cleanappledouble.pl             \
+       lp2pap.sh                       \
        netatalkshorternamelinks.pl
-
-SUFFIXES = .tmpl .
-
-.tmpl:
-       sed -e s@:BINDIR:@${bindir}@ \
-               -e s@:SBINDIR:@${sbindir}@ \
-               -e s@:ETCDIR:@${pkgconfdir}@ \
-               <$< >$@
+TEMPLATE_FILES = $(foreach f,$(GENERATED_FILES),$(f).in)
 
 CLEANFILES = $(GENERATED_FILES)
 
-bin_SCRIPTS = $(PERLSCRIPTS) $(GENERATED_FILES)
+bin_SCRIPTS = $(GENERATED_FILES)
 
-EXTRA_DIST = $(PERLSCRIPTS) $(TEMPLATE_FILES)
+EXTRA_DIST = $(TEMPLATE_FILES)

diff --git a/contrib/shell_utils/lp2pap.sh.in b/contrib/shell_utils/lp2pap.sh.in
new file mode 100644 (file)
index 0000000..fea0cf4
--- /dev/null
+++ b/contrib/shell_utils/lp2pap.sh.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+# pap script for lp systems
+
+chdir "/etc/lp/printers/`basename $0`"
+
+if [ -r "$6" ]; then
+    :BINDIR:/pap -E "$6"
+    exit $?
+fi
+
+exit 2

diff --git a/contrib/shell_utils/lp2pap.sh.tmpl b/contrib/shell_utils/lp2pap.sh.tmpl
deleted file mode 100755 (executable)
index fea0cf4..0000000
--- a/contrib/shell_utils/lp2pap.sh.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# pap script for lp systems
-
-chdir "/etc/lp/printers/`basename $0`"
-
-if [ -r "$6" ]; then
-    :BINDIR:/pap -E "$6"
-    exit $?
-fi
-
-exit 2