Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 155076
Collapse All | Expand All

(-)jpeg/makefile.cfg.orig (-27 / +30 lines)
Lines 12-25 Link Here
12
# Where to install the programs and man pages.
12
# Where to install the programs and man pages.
13
prefix = @prefix@
13
prefix = @prefix@
14
exec_prefix = @exec_prefix@
14
exec_prefix = @exec_prefix@
15
bindir = $(exec_prefix)/bin
15
bindir = @bindir@
16
libdir = $(exec_prefix)/lib
16
libdir = @libdir@
17
includedir = $(prefix)/include
17
includedir = @includedir@
18
binprefix =
18
binprefix =
19
manprefix =
19
manprefix =
20
manext = .1
20
manext = .1
21
mandir = $(prefix)/man
21
mandir = @mandir@
22
man1dir = $(mandir)/man1
22
man1dir = @mandir@/man1
23
23
24
# The name of your C compiler:
24
# The name of your C compiler:
25
CC= @CC@
25
CC= @CC@
Lines 71-77 Link Here
71
# directory creation command
71
# directory creation command
72
MKDIR= mkdir
72
MKDIR= mkdir
73
# library (.a) file creation command
73
# library (.a) file creation command
74
AR= ar rc
74
AR = @AR@
75
ARFLAGS = rc
75
# second step in .a creation (use "touch" if not needed)
76
# second step in .a creation (use "touch" if not needed)
76
AR2= @RANLIB@
77
AR2= @RANLIB@
77
# installation program
78
# installation program
Lines 193-199 Link Here
193
# without libtool:
194
# without libtool:
194
libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
195
libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
195
	$(RM) libjpeg.a
196
	$(RM) libjpeg.a
196
	$(AR) libjpeg.a  $(LIBOBJECTS)
197
	$(AR) $(ARFLAGS) libjpeg.a  $(LIBOBJECTS)
197
	$(AR2) libjpeg.a
198
	$(AR2) libjpeg.a
198
199
199
# with libtool:
200
# with libtool:
Lines 221-249 Link Here
221
# Installation rules:
222
# Installation rules:
222
223
223
install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
224
install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
224
	-@if [ ! -d $(bindir) ]; then mkdir -p $(bindir); fi
225
	-@if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir -p $(DESTDIR)$(bindir); fi
225
	-@if [ ! -d $(man1dir) ]; then mkdir -p $(man1dir); fi
226
	-@if [ ! -d $(DESTDIR)$(man1dir) ]; then mkdir -p $(DESTDIR)$(man1dir); fi
226
	$(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
227
	$(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg
227
	$(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
228
	$(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg
228
	$(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
229
	$(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran
229
	$(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom
230
	$(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom
230
	$(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom
231
	$(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom
231
	$(INSTALL_DATA) $(srcdir)/cjpeg.1 $(man1dir)/$(manprefix)cjpeg$(manext)
232
	$(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(man1dir)/$(manprefix)cjpeg$(manext)
232
	$(INSTALL_DATA) $(srcdir)/djpeg.1 $(man1dir)/$(manprefix)djpeg$(manext)
233
	$(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(man1dir)/$(manprefix)djpeg$(manext)
233
	$(INSTALL_DATA) $(srcdir)/jpegtran.1 $(man1dir)/$(manprefix)jpegtran$(manext)
234
	$(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(man1dir)/$(manprefix)jpegtran$(manext)
234
	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(man1dir)/$(manprefix)rdjpgcom$(manext)
235
	$(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(man1dir)/$(manprefix)rdjpgcom$(manext)
235
	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(man1dir)/$(manprefix)wrjpgcom$(manext)
236
	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(man1dir)/$(manprefix)wrjpgcom$(manext)
236
237
237
install-lib: libjpeg.$(A) install-headers
238
install-lib: libjpeg.$(A) install-headers
238
	-@if [ ! -d $(libdir) ]; then mkdir -p $(libdir); fi
239
	-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
239
	$(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)
240
	$(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A)
240
241
241
install-headers: jconfig.h
242
install-headers: jconfig.h
242
	-@if [ ! -d $(includedir) ]; then mkdir -p $(includedir); fi
243
	-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
243
	$(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h
244
	$(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
244
	$(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h
245
	$(INSTALL_DATA) $(srcdir)/jpegint.h $(DESTDIR)$(includedir)/jpegint.h
245
	$(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h
246
	$(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h
246
	$(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h
247
	$(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h
248
	$(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)$(includedir)/jerror.h
247
249
248
# Uninstallation rules:
250
# Uninstallation rules:
249
251
250
-- jpeg/configure
252
++ jpeg/configure
Lines 1777-1782 Link Here
1777
s%@CPP@%$CPP%g
1777
s%@CPP@%$CPP%g
1778
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
1778
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
1779
s%@INSTALL_DATA@%$INSTALL_DATA%g
1779
s%@INSTALL_DATA@%$INSTALL_DATA%g
1780
s%@AR@%${AR-ar}%g
1780
s%@RANLIB@%$RANLIB%g
1781
s%@RANLIB@%$RANLIB%g
1781
s%@LIBTOOL@%$LIBTOOL%g
1782
s%@LIBTOOL@%$LIBTOOL%g
1782
s%@O@%$O%g
1783
s%@O@%$O%g

Return to bug 155076