---- ./configure.in.org Thu Jun 25 08:37:22 1998
-+++ ./configure.in Wed Dec 12 22:51:10 2001
+--- enscript-1.6.2/configure.in.orig Tue Dec 8 07:57:44 1998
++++ enscript-1.6.2/configure.in Wed Mar 20 17:39:38 2002
@@ -8,25 +8,9 @@
AC_REVISION($Revision$)
AC_ISC_POSIX
AM_C_PROTOTYPES
-@@ -69,14 +53,6 @@
+@@ -74,14 +58,6 @@
AC_PROG_YACC
AM_PROG_LEX
dnl Define the default output media.
AC_ARG_WITH(media,
-@@ -140,12 +116,6 @@
+@@ -147,10 +123,6 @@
- AC_PATH_PROG(PERL, perl)
+ dnl substitutions
--dnl substitutions
--
-AC_SUBST(CFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LIBOBJS)
-
- AC_OUTPUT([Makefile enscript.1 compat/Makefile afm/Makefile afmlib/Makefile src/Makefile lib/Makefile scripts/Makefile intl/Makefile po/Makefile.in states/Makefile states/states.1 states/tests/Makefile tests/Makefile], [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in >po/Makefile])
-
- echo ""
+ AC_OUTPUT([Makefile \
+ compat/Makefile \
+ afm/Makefile \
uninstall-local:
rm -f $(sysconfdir)/enscript.cfg
---- enscript-1.6.1/states/Makefile.am~ Thu Dec 13 23:09:11 2001
-+++ enscript-1.6.1/states/Makefile.am Thu Dec 13 23:09:11 2001
-@@ -33,14 +33,14 @@
+--- enscript-1.6.2/states/Makefile.am.orig Fri Oct 23 15:21:49 1998
++++ enscript-1.6.2/states/Makefile.am Wed Mar 20 17:42:32 2002
+@@ -26,19 +26,17 @@
+
+ SUBDIRS = hl tests
+
+-AUTOMAKE_OPTIONS =
+-
bin_PROGRAMS = states
states_SOURCES = main.c utils.c prims.c process.c gram.y lex.l
noinst_HEADERS = defs.h gram.h
- EXTRA_DIST = states.1.in TODO enscript.st over.in enscript.el
+ EXTRA_DIST = TODO over.in enscript.el
-localedir = $(prefix)/@DATADIRNAME@/locale
+localedir = $(datadir)/locale
bin_SCRIPTS = over
-@@ -53,9 +53,5 @@
- DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -I. -I$(srcdir) -I..
- INCLUDES = -I$(srcdir)/../compat -I$(srcdir)/../afmlib -I$(srcdir)/../intl -I../intl
+--- enscript-1.6.2/afm/Makefile.am~ Wed Mar 20 17:48:08 2002
++++ enscript-1.6.2/afm/Makefile.am Wed Mar 20 17:48:08 2002
+@@ -34,11 +34,11 @@
+ EXTRA_DIST = font.map $(default_afm)
--install-data-local: enscript.st
+ install-data-local:
- $(top_srcdir)/mkinstalldirs $(datadir)/enscript
-- $(INSTALL_DATA) $(srcdir)/enscript.st $(datadir)/enscript/enscript.st
--
--uninstall-local:
-- rm -f $(datadir)/enscript/enscript.st
-+stdir = $(pkgdatadir)
-+st_DATA = enscript.st
+- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/afm
+ for f in $(EXTRA_DIST); do \
+- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
++ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/afm/$$f; \
+ done
+
+ uninstall-local:
+- rm -rf $(datadir)/enscript/afm
++ rm -rf $(DESTDIR)$(datadir)/enscript/afm
+--- enscript-1.6.2/states/hl/Makefile.am~ Wed Mar 20 17:53:09 2002
++++ enscript-1.6.2/states/hl/Makefile.am Wed Mar 20 17:53:09 2002
+@@ -44,11 +44,11 @@
+ EXTRA_DIST = $(states)
+
+ install-data-local:
+- $(top_srcdir)/mkinstalldirs $(datadir)/enscript
+- $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/hl
+ for f in $(states); do \
+- $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
++ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/hl/$$f; \
+ done
+
+ uninstall-local:
+- rm -rf $(datadir)/enscript/hl
++ rm -rf $(DESTDIR)$(datadir)/enscript/hl