| 520f7cd3 |
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 |
| 3 | @@ -28,8 +28,6 @@ |
| 4 | |
| 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@ |
| 9 | |
| 10 | noinst_HEADERS = dummypwd.h getopt.h regex.h xalloc.h |
| 11 | |
| 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 |
| 14 | @@ -37,12 +37,8 @@ |
| 15 | all-local: enscript.cfg |
| 16 | |
| 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; \ |
| 21 | - else :; \ |
| 22 | - fi |
| 23 | - $(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg |
| 24 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) |
| 25 | + $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg |
| 26 | |
| 27 | uninstall-local: |
| 28 | rm -f $(sysconfdir)/enscript.cfg |
| 5de32d90 |
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 |
| 31 | @@ -26,19 +26,17 @@ |
| 32 | |
| 33 | SUBDIRS = hl tests |
| 34 | |
| 35 | -AUTOMAKE_OPTIONS = |
| 36 | - |
| 520f7cd3 |
37 | bin_PROGRAMS = states |
| 38 | states_SOURCES = main.c utils.c prims.c process.c gram.y lex.l |
| 39 | |
| 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 |
| 44 | |
| 45 | noinst_HEADERS = defs.h gram.h |
| 46 | |
| 5de32d90 |
47 | EXTRA_DIST = TODO over.in enscript.el |
| 520f7cd3 |
48 | |
| 49 | -localedir = $(prefix)/@DATADIRNAME@/locale |
| 50 | +localedir = $(datadir)/locale |
| 51 | |
| 52 | bin_SCRIPTS = over |
| 53 | |
| 5de32d90 |
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 |
| 56 | @@ -34,11 +34,11 @@ |
| 57 | EXTRA_DIST = font.map $(default_afm) |
| 520f7cd3 |
58 | |
| 5de32d90 |
59 | install-data-local: |
| 520f7cd3 |
60 | - $(top_srcdir)/mkinstalldirs $(datadir)/enscript |
| 5de32d90 |
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; \ |
| 67 | done |
| 68 | |
| 69 | uninstall-local: |
| 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 |
| 74 | @@ -44,11 +44,11 @@ |
| 75 | EXTRA_DIST = $(states) |
| 76 | |
| 77 | install-data-local: |
| 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; \ |
| 85 | done |
| 86 | |
| 87 | uninstall-local: |
| 88 | - rm -rf $(datadir)/enscript/hl |
| 89 | + rm -rf $(DESTDIR)$(datadir)/enscript/hl |
projects / packages / enscript.git / blame