1 --- enscript-1.6.1/compat/Makefile.am~ Thu Dec 13 21:16:15 2001
2 +++ enscript-1.6.1/compat/Makefile.am Thu Dec 13 21:16:15 2001
5 noinst_LIBRARIES = libcompat.a
6 libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c
7 -libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@
8 -libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
10 noinst_HEADERS = dummypwd.h getopt.h regex.h xalloc.h
12 --- enscript-1.6.1/lib/Makefile.am~ Thu Dec 13 21:20:28 2001
13 +++ enscript-1.6.1/lib/Makefile.am Thu Dec 13 21:20:28 2001
15 all-local: enscript.cfg
17 install-data-local: enscript.cfg
18 - $(top_srcdir)/mkinstalldirs $(sysconfdir)
19 - if test -r $(sysconfdir)/enscript.cfg; then \
20 - cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \
23 - $(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg
24 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
25 + $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg
28 rm -f $(sysconfdir)/enscript.cfg
29 --- enscript-1.6.2/states/Makefile.am.orig Fri Oct 23 15:21:49 1998
30 +++ enscript-1.6.2/states/Makefile.am Wed Mar 20 17:42:32 2002
38 states_SOURCES = main.c utils.c prims.c process.c gram.y lex.l
40 -LDADD = ../afmlib/libafm.a @INTLLIBS@ ../compat/libcompat.a @LEXLIB@
41 -states_DEPENDENCIES = @INTLLIBS@ ../compat/libcompat.a
42 +LDADD = ../afmlib/libafm.a $(INTLLIBS) ../compat/libcompat.a $(LEXLIB)
43 +states_DEPENDENCIES = $(INTLLIBS) ../compat/libcompat.a
45 noinst_HEADERS = defs.h gram.h
47 EXTRA_DIST = TODO over.in enscript.el
49 -localedir = $(prefix)/@DATADIRNAME@/locale
50 +localedir = $(datadir)/locale
54 --- enscript-1.6.2/afm/Makefile.am~ Wed Mar 20 17:48:08 2002
55 +++ enscript-1.6.2/afm/Makefile.am Wed Mar 20 17:48:08 2002
57 EXTRA_DIST = font.map $(default_afm)
60 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript
61 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
62 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
63 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/afm
64 for f in $(EXTRA_DIST); do \
65 - $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
66 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/afm/$$f; \
70 - rm -rf $(datadir)/enscript/afm
71 + rm -rf $(DESTDIR)$(datadir)/enscript/afm
72 --- enscript-1.6.2/states/hl/Makefile.am~ Wed Mar 20 17:53:09 2002
73 +++ enscript-1.6.2/states/hl/Makefile.am Wed Mar 20 17:53:09 2002
75 EXTRA_DIST = $(states)
78 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript
79 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
80 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
81 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/hl
82 for f in $(states); do \
83 - $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
84 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/hl/$$f; \
88 - rm -rf $(datadir)/enscript/hl
89 + rm -rf $(DESTDIR)$(datadir)/enscript/hl