Use configure mechanism for generating files. Don't distribute generated

perl scripts.

diff --git a/configure.in b/configure.in
index 872332a52dd0e035407a476648c469fd08cd1987..d61aa31992c0e9e4682f87fa24d5f238d5c945c9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179 2003-03-09 19:55:33 didg Exp $
+dnl $Id: configure.in,v 1.180 2003-06-06 16:16:45 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -707,6 +707,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
        contrib/a2boot/Makefile

diff --git a/contrib/shell_utils/Makefile.am b/contrib/shell_utils/Makefile.am
index dabbc23e27de4a8a22f85d568d05feb685b95da8..6cdbb1709b6003554359b880e72d004fd233b922 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).tmpl)
 
 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..ae3b6f3
--- /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