/[pkgs]/devel/enscript/enscript-1.6.1-config.patch
ViewVC logotype

Contents of /devel/enscript/enscript-1.6.1-config.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.2 - (show annotations) (download) (as text)
Fri Dec 23 10:28:41 2005 UTC (3 years, 11 months ago) by twaugh
Branch: MAIN
CVS Tags: F-12-split, enscript-1_6_4-11_fc10, enscript-1_6_4-1_1, F-7-split, FC-5-split, enscript-1_6_4-3_1, enscript-1_6_4-14_fc12, F-10-split, F-11-split, enscript-1_6_4-9_fc9, enscript-1_6_4-12_fc11, enscript-1_6_4-7_fc7, F-9-split, FC-6-split, enscript-1_6_4-13_fc12, F-8-split, enscript-1_6_4-10_fc10, enscript-1_6_4-5_fc7, enscript-1_6_4-1_1_2, enscript-1_6_4-1_1_1, enscript-1_6_4-6_fc7, enscript-1_6_4-4_fc6, enscript-1_6_4-3, enscript-1_6_4-2, enscript-1_6_4-1, enscript-1_6_4-8_fc8, HEAD
Changes since 1.1: +70 -51 lines
File MIME type: text/x-patch 
* Fri Dec 23 2005 Tim Waugh <twaugh@redhat.com> 1.6.4-1
- 1.6.4.  No longer need tmp, CAN-2004-1184, demunge patches.
1 --- enscript-1.6.4/afm/Makefile.am.config 2003-03-05 07:26:16.000000000 +0000
2 +++ enscript-1.6.4/afm/Makefile.am 2005-12-23 09:56:52.000000000 +0000
3 @@ -36,11 +36,11 @@
4 EXTRA_DIST = font.map $(default_afm) $(public_fonts)
5
6 install-data-local:
7 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript
8 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
9 + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
10 + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm
11 for f in $(EXTRA_DIST); do \
12 - $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
13 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \
14 done
15
16 uninstall-local:
17 - rm -rf $(datadir)/enscript/afm
18 + rm -rf $(DESTDIR)/$(datadir)/enscript/afm
19 --- enscript-1.6.4/afm/Makefile.in.config 2003-03-05 07:40:06.000000000 +0000
20 +++ enscript-1.6.4/afm/Makefile.in 2005-12-23 09:56:52.000000000 +0000
21 @@ -319,14 +319,14 @@
22
23
24 install-data-local:
25 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript
26 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
27 + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
28 + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/afm
29 for f in $(EXTRA_DIST); do \
30 - $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
31 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/afm/$$f; \
32 done
33
34 uninstall-local:
35 - rm -rf $(datadir)/enscript/afm
36 + rm -rf $(DESTDIR)/$(datadir)/enscript/afm
37 # Tell versions [3.59,3.63) of GNU make to not export all variables.
38 # Otherwise a system limit (for SysV at least) may be exceeded.
39 .NOEXPORT:
40 --- enscript-1.6.4/lib/Makefile.in.config 2003-03-05 07:40:07.000000000 +0000
41 +++ enscript-1.6.4/lib/Makefile.in 2005-12-23 09:56:52.000000000 +0000
42 @@ -345,15 +345,16 @@
43 all-local: enscript.cfg
44
45 install-data-local: enscript.cfg
46 - $(top_srcdir)/mkinstalldirs $(sysconfdir)
47 - if test -r $(sysconfdir)/enscript.cfg; then \
48 - cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \
49 + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
50 + if test -r $(DESTDIR)$(sysconfdir)/enscript.cfg; then \
51 + cp $(DESTDIR)$(sysconfdir)/enscript.cfg \
52 + $(DESTDIR)$(sysconfdir)/enscript.cfg.old; \
53 else :; \
54 fi
55 - $(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg
56 + $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg
57
58 uninstall-local:
59 - rm -f $(sysconfdir)/enscript.cfg
60 + rm -f $(DESTDIR)$(sysconfdir)/enscript.cfg
61
62 enscript.cfg: $(srcdir)/enscript.cfg.in Makefile
63 sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \
64 --- enscript-1.6.4/states/hl/Makefile.am.config 2005-12-23 09:59:55.000000000 +0000
65 +++ enscript-1.6.4/states/hl/Makefile.am 2005-12-23 10:00:09.000000000 +0000
66 @@ -45,10 +45,10 @@
67 EXTRA_DIST = $(states)
68
69 install-data-local:
70 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript
71 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
72 + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
73 + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl
74 for f in $(states); do \
75 - $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
76 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \
77 done
78
79 uninstall-local:
80 --- enscript-1.6.4/states/hl/Makefile.in.config 2005-12-23 10:00:13.000000000 +0000
81 +++ enscript-1.6.4/states/hl/Makefile.in 2005-12-23 10:00:34.000000000 +0000
82 @@ -330,10 +330,10 @@
83
84
85 install-data-local:
86 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript
87 - $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
88 + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript
89 + $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/enscript/hl
90 for f in $(states); do \
91 - $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
92 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)/$(datadir)/enscript/hl/$$f; \
93 done
94
95 uninstall-local:
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2