Magellan Linux

Annotation of /trunk/ghostscript-esp/patches/ghostscript-esp-8.15.1-destdir.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 144 - (hide annotations) (download)
Tue May 8 20:06:05 2007 UTC (17 years, 1 month ago) by niro
File size: 13364 byte(s)
-import

1 niro 144 diff -urN espgs-8.15.1.orig/addons/addons.mak espgs-8.15.1/addons/addons.mak
2     --- espgs-8.15.1.orig/addons/addons.mak 2005-08-16 10:07:21.000000000 +0000
3     +++ espgs-8.15.1/addons/addons.mak 2005-11-03 11:57:30.000000000 +0000
4     @@ -953,9 +953,9 @@
5     $(GLCC) $(O_)$@ $(C_) $(JAPSRC)dviprlib.c
6    
7     extra-dmprt-install:
8     - $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(install_prefix)$(gsdatadir)$(D)lib || exit 1
9     - $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(install_prefix)$(gsdatadir)$(D)lib || exit 1
10     - $(INSTALL_DATA) $(JAPSRC)escp_24.src $(install_prefix)$(gsdatadir)$(D)lib || exit 1
11     + $(INSTALL_DATA) $(JAPSRC)dmp_init.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
12     + $(INSTALL_DATA) $(JAPSRC)dmp_site.ps $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
13     + $(INSTALL_DATA) $(JAPSRC)escp_24.src $(DESTDIR)$(gsdatadir)$(D)lib || exit 1
14    
15    
16    
17     @@ -1095,7 +1095,7 @@
18    
19     extra-upp-install:
20     for f in $(ADSRC)uniprint$(D)*.upp; do \
21     - $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)$(D)lib || exit 1; \
22     + $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)$(D)lib || exit 1; \
23     done
24    
25     ### ------------ Build/Install special features ------------ ###
26     diff -urN espgs-8.15.1.orig/pstoraster/cups.mak espgs-8.15.1/pstoraster/cups.mak
27     --- espgs-8.15.1.orig/pstoraster/cups.mak 2005-02-21 16:17:00.000000000 +0000
28     +++ espgs-8.15.1/pstoraster/cups.mak 2005-11-03 11:57:30.000000000 +0000
29     @@ -24,9 +24,9 @@
30    
31     cups_= $(GLOBJ)gdevcups.$(OBJ)
32    
33     -CUPSSERVER= $(install_prefix)`cups-config --serverbin`
34     -CUPSCONFIG= $(install_prefix)`cups-config --serverroot`
35     -CUPSDATA= $(install_prefix)`cups-config --datadir`
36     +CUPSSERVER= $(DESTDIR)`cups-config --serverbin`
37     +CUPSCONFIG= $(DESTDIR)`cups-config --serverroot`
38     +CUPSDATA= $(DESTDIR)`cups-config --datadir`
39    
40     $(DD)cups.dev: $(cups_) $(GLD)page.dev
41     $(ADDMOD) $(DD)cups -lib cupsimage -lib cups
42     diff -urN espgs-8.15.1.orig/src/all-arch.mak espgs-8.15.1/src/all-arch.mak
43     --- espgs-8.15.1.orig/src/all-arch.mak 2005-01-23 03:49:47.000000000 +0000
44     +++ espgs-8.15.1/src/all-arch.mak 2005-11-03 11:57:30.000000000 +0000
45     @@ -298,24 +298,24 @@
46     # Remove the old gs binary first, so as to preserve the previous
47     # gs-x.yy version, if any.
48     install-binary:
49     - -$(RM) $(BINDIR)/$(GS)
50     + -$(RM) $(DESTDIR)$(BINDIR)/$(GS)
51     @$(MAKE) $(ARGS) install GS=$(GS) XLIBDIRS=$(XLIBDIRSALL) ; \
52     d=`pwd` ; \
53     d=`basename $$d` ; \
54     d=`echo $$d | sed -e s/gs/gs-/` ; \
55     - $(RM) $(BINDIR)/$$d ; \
56     - ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \
57     - ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d
58     + $(RM) $(DESTDIR)$(BINDIR)/$$d ; \
59     + ln $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d ; \
60     + ls -l $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d
61    
62     install-binary-gnu-readline:
63     - -$(RM) $(BINDIR)/$(GS)
64     + -$(RM) $(DESTDIR)$(BINDIR)/$(GS)
65     @$(MAKE) $(ARGS) install GS=$(GS) XLIBDIRS=$(XLIBDIRSALL) $(GNU_READLINE_ARGS) ; \
66     d=`pwd` ; \
67     d=`basename $$d` ; \
68     d=`echo $$d | sed -e s/gs/gs-/` ; \
69     - $(RM) $(BINDIR)/$$d ; \
70     - ln $(BINDIR)/$(GS) $(BINDIR)/$$d ; \
71     - ls -l $(BINDIR)/$(GS) $(BINDIR)/$$d
72     + $(RM) $(DESTDIR)$(BINDIR)/$$d ; \
73     + ln $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d ; \
74     + ls -l $(DESTDIR)$(BINDIR)/$(GS) $(DESTDIR)$(BINDIR)/$$d
75    
76     install-fontmap:
77     @d=`pwd` ; \
78     @@ -323,14 +323,14 @@
79     d=`echo $$d | sed -e s/gs//` ; \
80     if test -f $(GS_SRC_DIR)/Fontmap.new ; \
81     then \
82     - if test -f $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
83     + if test -f $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
84     then \
85     true ; \
86     else \
87     - mv $(GS_SHARE_DIR)/$$d/lib/Fontmap $(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
88     + mv $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap.org ; \
89     fi ; \
90     - $(CP) $(GS_SRC_DIR)/Fontmap.new $(GS_SHARE_DIR)/$$d/lib/Fontmap ; \
91     - ls -l $(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \
92     + $(CP) $(GS_SRC_DIR)/Fontmap.new $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap ; \
93     + ls -l $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/Fontmap* ; \
94     fi
95    
96     install-pdfsec:
97     @@ -339,9 +339,9 @@
98     d=`echo $$d | sed -e s/gs//` ; \
99     if test -f $(GS_SRC_DIR)/lib/pdf_sec.ps ; \
100     then \
101     - $(MV) $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \
102     - $(CP) lib/pdf_sec.ps $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
103     - $(CHMOD) 664 $(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
104     + $(MV) $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps.org ; \
105     + $(CP) lib/pdf_sec.ps $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
106     + $(CHMOD) 664 $(DESTDIR)$(GS_SHARE_DIR)/$$d/lib/pdf_sec.ps ; \
107     fi
108    
109     #=======================================================================
110     diff -urN espgs-8.15.1.orig/src/macos-fw.mak espgs-8.15.1/src/macos-fw.mak
111     --- espgs-8.15.1.orig/src/macos-fw.mak 2005-01-19 04:08:41.000000000 +0000
112     +++ espgs-8.15.1/src/macos-fw.mak 2005-11-03 11:57:30.000000000 +0000
113     @@ -103,19 +103,19 @@
114     $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
115    
116     install-so: so
117     - -mkdir $(prefix)
118     - -mkdir $(datadir)
119     - -mkdir $(gsdir)
120     - -mkdir $(gsdatadir)
121     - -mkdir $(bindir)
122     - -mkdir $(libdir)
123     - $(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
124     - $(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
125     - $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
126     - $(RM_) $(libdir)/$(GS_SONAME)
127     - ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
128     - $(RM_) $(libdir)/$(GS_SONAME_MAJOR)
129     - ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
130     + -mkdir $(DESTDIR)$(prefix)
131     + -mkdir $(DESTDIR)$(datadir)
132     + -mkdir $(DESTDIR)$(gsdir)
133     + -mkdir $(DESTDIR)$(gsdatadir)
134     + -mkdir $(DESTDIR)$(bindir)
135     + -mkdir $(DESTDIR)$(libdir)
136     + $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
137     + $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
138     + $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
139     + $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
140     + ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
141     + $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
142     + ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
143    
144     soinstall: install-so install-scripts install-data
145    
146     @@ -144,8 +144,8 @@
147     cp -r doc $(GS_FRAMEWORK)/Versions/Current
148    
149     framework_install : framework
150     - rm -rf $(prefix)
151     - cp -r $(GS_FRAMEWORK) $(prefix)
152     + rm -rf $(DESTDIR)$(prefix)
153     + cp -r $(GS_FRAMEWORK) $(DESTDIR)$(prefix)
154    
155     # Make the build directories
156     SODIRS: STDDIRS
157     diff -urN espgs-8.15.1.orig/src/unix-dll.mak espgs-8.15.1/src/unix-dll.mak
158     --- espgs-8.15.1.orig/src/unix-dll.mak 2005-01-19 04:08:41.000000000 +0000
159     +++ espgs-8.15.1/src/unix-dll.mak 2005-11-03 11:57:30.000000000 +0000
160     @@ -96,19 +96,19 @@
161     $(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
162    
163     install-so: so
164     - -mkdir -p $(prefix)
165     - -mkdir -p $(datadir)
166     - -mkdir -p $(gsdir)
167     - -mkdir -p $(gsdatadir)
168     - -mkdir -p $(bindir)
169     - -mkdir -p $(libdir)
170     - $(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
171     - $(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
172     - $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
173     - $(RM_) $(libdir)/$(GS_SONAME)
174     - ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
175     - $(RM_) $(libdir)/$(GS_SONAME_MAJOR)
176     - ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
177     + -mkdir -p $(DESTDIR)$(prefix)
178     + -mkdir -p $(DESTDIR)$(datadir)
179     + -mkdir -p $(DESTDIR)$(gsdir)
180     + -mkdir -p $(DESTDIR)$(gsdatadir)
181     + -mkdir -p $(DESTDIR)$(bindir)
182     + -mkdir -p $(DESTDIR)$(libdir)
183     + $(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
184     + $(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
185     + $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
186     + $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
187     + ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
188     + $(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
189     + ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
190    
191     soinstall: install-so install-scripts install-data
192    
193     diff -urN espgs-8.15.1.orig/src/unixinst.mak espgs-8.15.1/src/unixinst.mak
194     --- espgs-8.15.1.orig/src/unixinst.mak 2005-09-22 17:03:45.000000000 +0000
195     +++ espgs-8.15.1/src/unixinst.mak 2005-11-03 11:57:30.000000000 +0000
196     @@ -28,24 +28,24 @@
197     # rules, just in case bindir or scriptdir is a subdirectory of any of these.
198    
199     install-exec: STDDIRS $(GS_XE)
200     - -mkdir -p $(datadir)
201     - -mkdir -p $(install_prefix)$(gsdir)
202     - -mkdir -p $(install_prefix)$(gsdatadir)
203     - -mkdir -p $(bindir)
204     - $(INSTALL_PROGRAM) $(GS_XE) $(bindir)/$(GS)
205     + -mkdir -p $(DESTDIR)$(datadir)
206     + -mkdir -p $(DESTDIR)$(gsdir)
207     + -mkdir -p $(DESTDIR)$(gsdatadir)
208     + -mkdir -p $(DESTDIR)$(bindir)
209     + $(INSTALL_PROGRAM) $(GS_XE) $(DESTDIR)$(bindir)/$(GS)
210    
211     install-scripts: $(PSLIBDIR)/gsnd
212     - -mkdir -p $(datadir)
213     - -mkdir -p $(install_prefix)$(gsdir)
214     - -mkdir -p $(install_prefix)$(gsdatadir)
215     - -mkdir -p $(scriptdir)
216     + -mkdir -p $(DESTDIR)$(datadir)
217     + -mkdir -p $(DESTDIR)$(gsdir)
218     + -mkdir -p $(DESTDIR)$(gsdatadir)
219     + -mkdir -p $(DESTDIR)$(scriptdir)
220     $(SH) -c 'for f in \
221     gsbj gsdj gsdj500 gslj gslp gsnd \
222     bdftops dumphints dvipdf eps2eps font2c \
223     pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa printafm \
224     ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr ps2ps wftopfa \
225     fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\
226     - do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(scriptdir); fi;\
227     + do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_PROGRAM) $(PSLIBDIR)/$$f $(DESTDIR)$(scriptdir); fi;\
228     done'
229    
230     PSRESDIR=$(PSLIBDIR)/../Resource
231     @@ -59,10 +59,10 @@
232     # one file from each subdirectory just as a sanity check.
233    
234     install-libdata:
235     - -mkdir -p $(datadir)
236     - -mkdir -p $(install_prefix)$(gsdir)
237     - -mkdir -p $(install_prefix)$(gsdatadir)
238     - -mkdir -p $(install_prefix)$(gsdatadir)/lib
239     + -mkdir -p $(DESTDIR)$(datadir)
240     + -mkdir -p $(DESTDIR)$(gsdir)
241     + -mkdir -p $(DESTDIR)$(gsdatadir)
242     + -mkdir -p $(DESTDIR)$(gsdatadir)/lib
243     $(SH) -c 'for f in \
244     Fontmap Fontmap.GS cidfmap \
245     FAPIcidfmap FAPIconfig FAPIfontmap xlatmap \
246     @@ -80,24 +80,24 @@
247     winmaps.ps wftopfa.ps wrfont.ps zeroline.ps \
248     pdf2dsc.ps pdfopt.ps \
249     dmp_init.ps dmp_site.ps gdevmjc.ps escp_24.src ;\
250     - do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(install_prefix)$(gsdatadir)/lib; fi;\
251     + do if ( test -f $(PSLIBDIR)/$$f ); then $(INSTALL_DATA) $(PSLIBDIR)/$$f $(DESTDIR)$(gsdatadir)/lib; fi;\
252     done'
253     $(SH) -c 'for f in $(PSLIBDIR)/gs_*.ps $(PSLIBDIR)/pdf*.ps;\
254     - do $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)/lib ;\
255     + do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\
256     done'
257     $(SH) -c 'for f in $(PSLIBDIR)/*.ppd $(PSLIBDIR)/*.rpd $(PSLIBDIR)/*.upp $(PSLIBDIR)/*.xbm $(PSLIBDIR)/*.xpm;\
258     - do $(INSTALL_DATA) $$f $(install_prefix)$(gsdatadir)/lib ;\
259     + do $(INSTALL_DATA) $$f $(DESTDIR)$(gsdatadir)/lib ;\
260     done'
261    
262     # install the default resource files
263     # copy in every category (directory) but CVS
264     RES_CATEGORIES=`ls $(PSRESDIR) | grep -v CVS`
265     install-resdata: $(PSRESDIR)/Decoding/Unicode
266     - -mkdir -p $(datadir)
267     - -mkdir -p $(install_prefix)$(gsdir)
268     - -mkdir -p $(install_prefix)$(gsdatadir)/Resource
269     + -mkdir -p $(DESTDIR)$(datadir)
270     + -mkdir -p $(DESTDIR)$(gsdir)
271     + -mkdir -p $(DESTDIR)$(gsdatadir)/Resource
272     $(SH) -c 'for dir in $(RES_CATEGORIES); do \
273     - rdir=$(install_prefix)$(gsdatadir)/Resource/$$dir ; \
274     + rdir=$(DESTDIR)$(gsdatadir)/Resource/$$dir ; \
275     test -d $$rdir || mkdir -p $$rdir ; \
276     for file in $(PSRESDIR)/$$dir/*; do \
277     if test -f $$file; then $(INSTALL_DATA) $$file $$rdir ; fi \
278     @@ -118,9 +118,9 @@
279     Psfiles.htm Public.htm Readme.htm Release.htm \
280     Source.htm Tester.htm Unix-lpr.htm Use.htm Xfonts.htm
281     install-doc: $(PSDOCDIR)/News.htm
282     - -mkdir -p $(install_prefix)$(docdir)
283     + -mkdir -p $(DESTDIR)$(docdir)
284     $(SH) -c 'for f in $(DOC_PAGES) ;\
285     - do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(install_prefix)$(docdir); fi;\
286     + do if ( test -f $(PSDOCDIR)/$$f ); then $(INSTALL_DATA) $(PSDOCDIR)/$$f $(DESTDIR)$(docdir); fi;\
287     done'
288    
289     # install the man pages for each locale
290     @@ -129,9 +129,9 @@
291     MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
292     MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
293     install-man: $(PSMANDIR)/gs.1
294     - $(SH) -c 'test -d $(mandir) || mkdir -p $(mandir)'
295     + $(SH) -c 'test -d $(DESTDIR)$(mandir) || mkdir -p $(DESTDIR)$(mandir)'
296     $(SH) -c 'for d in $(MAN_LCDIRS) ;\
297     - do man1dir=$(mandir)/$$d/man$(man1ext) ;\
298     + do man1dir=$(DESTDIR)$(mandir)/$$d/man$(man1ext) ;\
299     ( test -d $$man1dir || mkdir -p $$man1dir ) ;\
300     for f in $(PSMANDIR)/$$d/*.1 ;\
301     do $(INSTALL_DATA) $$f $$man1dir ;\
302     @@ -158,15 +158,15 @@
303    
304     # install the example files
305     install-examples:
306     - -mkdir -p $(install_prefix)$(exdir)
307     + -mkdir -p $(DESTDIR)$(exdir)
308     for f in \
309     alphabet.ps colorcir.ps doretree.ps escher.ps \
310     golfer.eps grayalph.ps snowflak.ps tiger.eps vasarely.ps waterfal.ps \
311     ridt91.eps ;\
312     - do $(INSTALL_DATA) $(PSEXDIR)/$$f $(install_prefix)$(exdir) ;\
313     + do $(INSTALL_DATA) $(PSEXDIR)/$$f $(DESTDIR)$(exdir) ;\
314     done
315    
316     install-shared: $(GS_SHARED_OBJS)
317     - -mkdir -p $(gssharedir)
318     + -mkdir -p $(DESTDIR)$(gssharedir)
319     $(SH) -c 'echo $(GS_SHARED_OBJS) | while read obj ; do \
320     - test -z $$obj || $(INSTALL_PROGRAM) $$obj $(gssharedir)/; done'
321     + test -z $$obj || $(INSTALL_PROGRAM) $$obj $(DESTDIR)$(gssharedir)/; done'