package/jpeg/jpeg-build.patch

   1 - Respect options from configure (bindir/libdir/etc...)
   2 - Grab AR from the env instead of hardcoding to 'ar'
   3 - Fix install to respect $(DESTDIR)
   4 - Also install jpegint.h #64254
   5
   6 --- jpeg/makefile.cfg
   7 +++ jpeg/makefile.cfg
   8 @@ -11,13 +11,13 @@
   9  # Where to install the programs and man pages.
  10  prefix = @prefix@
  11  exec_prefix = @exec_prefix@
  12 -bindir = $(exec_prefix)/bin
  13 -libdir = $(exec_prefix)/lib
  14 -includedir = $(prefix)/include
  15 +bindir = @bindir@
  16 +libdir = @libdir@
  17 +includedir = @includedir@
  18  binprefix =
  19  manprefix =
  20  manext = 1
  21 -mandir = $(prefix)/man/man$(manext)
  22 +mandir = @mandir@/man$(manext)
  23
  24  # The name of your C compiler:
  25  CC= @CC@
  26 @@ -60,7 +60,8 @@
  27  # directory creation command
  28  MKDIR= mkdir
  29  # library (.a) file creation command
  30 -AR= ar rc
  31 +AR = @AR@
  32 +ARFLAGS = rc
  33  # second step in .a creation (use "touch" if not needed)
  34  AR2= @RANLIB@
  35  # installation program
  36 @@ -163,7 +164,7 @@
  37  # without libtool:
  38  libjpeg.a: @A2K_DEPS@ $(LIBOBJECTS)
  39         $(RM) libjpeg.a
  40 -       $(AR) libjpeg.a  $(LIBOBJECTS)
  41 +       $(AR) $(ARFLAGS) libjpeg.a  $(LIBOBJECTS)
  42         $(AR2) libjpeg.a
  43
  44  # with libtool:
  45 @@ -191,25 +191,29 @@
  46  # Installation rules:
  47
  48  install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
  49 -       $(INSTALL_PROGRAM) cjpeg $(bindir)/$(binprefix)cjpeg
  50 -       $(INSTALL_PROGRAM) djpeg $(bindir)/$(binprefix)djpeg
  51 -       $(INSTALL_PROGRAM) jpegtran $(bindir)/$(binprefix)jpegtran
  52 -       $(INSTALL_PROGRAM) rdjpgcom $(bindir)/$(binprefix)rdjpgcom
  53 -       $(INSTALL_PROGRAM) wrjpgcom $(bindir)/$(binprefix)wrjpgcom
  54 -       $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(mandir)/$(manprefix)cjpeg.$(manext)
  55 -       $(INSTALL_DATA) $(srcdir)/djpeg.1 $(mandir)/$(manprefix)djpeg.$(manext)
  56 -       $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(mandir)/$(manprefix)jpegtran.$(manext)
  57 -       $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(mandir)/$(manprefix)rdjpgcom.$(manext)
  58 -       $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(mandir)/$(manprefix)wrjpgcom.$(manext)
  59 +       mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)
  60 +       $(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg
  61 +       $(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg
  62 +       $(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran
  63 +       $(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom
  64 +       $(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom
  65 +       $(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext)
  66 +       $(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext)
  67 +       $(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext)
  68 +       $(INSTALL_DATA) $(srcdir)/rdjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)rdjpgcom.$(manext)
  69 +       $(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext)
  70
  71  install-lib: libjpeg.$(A) install-headers
  72 -       $(INSTALL_LIB) libjpeg.$(A) $(libdir)/$(binprefix)libjpeg.$(A)
  73 +       mkdir -p $(DESTDIR)$(libdir)
  74 +       $(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A)
  75
  76  install-headers: jconfig.h
  77 -       $(INSTALL_DATA) jconfig.h $(includedir)/jconfig.h
  78 -       $(INSTALL_DATA) $(srcdir)/jpeglib.h $(includedir)/jpeglib.h
  79 -       $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(includedir)/jmorecfg.h
  80 -       $(INSTALL_DATA) $(srcdir)/jerror.h $(includedir)/jerror.h
  81 +       mkdir -p $(DESTDIR)$(includedir)
  82 +       $(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
  83 +       $(INSTALL_DATA) $(srcdir)/jpegint.h $(DESTDIR)$(includedir)/jpegint.h
  84 +       $(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h
  85 +       $(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h
  86 +       $(INSTALL_DATA) $(srcdir)/jerror.h $(DESTDIR)$(includedir)/jerror.h
  87
  88  clean:
  89         $(RM) *.o *.lo libjpeg.a libjpeg.la
  90 --- jpeg/configure
  91 +++ jpeg/configure
  92 @@ -1777,6 +1777,7 @@
  93  s%@CPP@%$CPP%g
  94  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
  95  s%@INSTALL_DATA@%$INSTALL_DATA%g
  96 +s%@AR@%${AR-ar}%g
  97  s%@RANLIB@%$RANLIB%g
  98  s%@LIBTOOL@%$LIBTOOL%g
  99  s%@O@%$O%g