org.handhelds.familiar/packages/enscript/enscript-1.6.4/autotools.patch

   1
   2 #
   3 # Patch managed by http://www.holgerschurig.de/patcher.html
   4 #
   5
   6 --- enscript-1.6.4/configure.in~autotools
   7 +++ enscript-1.6.4/configure.in
   8 @@ -11,6 +11,8 @@
   9
  10  AC_PROG_INSTALL
  11
  12 +AC_PROG_CC
  13 +
  14  AC_ARG_WITH(cc,
  15  [  --with-cc(=CC)        use system's native compiler (or compiler CC)],
  16    if test "X$withval" != "Xno"; then
  17 @@ -25,10 +27,6 @@
  18    fi
  19  )
  20
  21 -if test "X$CC" = "X"; then
  22 -  AC_PROG_CC
  23 -fi
  24 -
  25  AC_ISC_POSIX
  26  AM_C_PROTOTYPES
  27
  28 --- enscript-1.6.4/Makefile.am~autotools
  29 +++ enscript-1.6.4/Makefile.am
  30 @@ -31,4 +31,4 @@
  31  88595.txt 88597.txt 88599.txt 885910.txt ibmpc.txt mac.txt vms.txt     \
  32  hp8.txt koi8.txt mtr.eps mtr_small.eps mtr_tiny.eps
  33
  34 -ACLOCAL_AMFLAGS = -I m4
  35 +#ACLOCAL_AMFLAGS = -I m4
  36 --- enscript-1.6.4/afm/Makefile.am~autotools
  37 +++ enscript-1.6.4/afm/Makefile.am
  38 @@ -36,11 +36,11 @@
  39  EXTRA_DIST = font.map $(default_afm) $(public_fonts)
  40
  41  install-data-local:
  42 -       $(top_srcdir)/mkinstalldirs $(datadir)/enscript
  43 -       $(top_srcdir)/mkinstalldirs $(datadir)/enscript/afm
  44 +       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
  45 +       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/afm
  46         for f in $(EXTRA_DIST); do \
  47 -         $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/afm/$$f; \
  48 +         $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/afm/$$f; \
  49         done
  50
  51  uninstall-local:
  52 -       rm -rf $(datadir)/enscript/afm
  53 +       rm -rf $(DESTDIR)$(datadir)/enscript/afm
  54 --- enscript-1.6.4/lib/Makefile.am~autotools
  55 +++ enscript-1.6.4/lib/Makefile.am
  56 @@ -38,15 +38,15 @@
  57  all-local: enscript.cfg
  58
  59  install-data-local: enscript.cfg
  60 -       $(top_srcdir)/mkinstalldirs $(sysconfdir)
  61 -       if test -r $(sysconfdir)/enscript.cfg; then \
  62 -         cp $(sysconfdir)/enscript.cfg $(sysconfdir)/enscript.cfg.old; \
  63 +       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
  64 +       if test -r $(DESTDIR)$(sysconfdir)/enscript.cfg; then \
  65 +         cp $(DESTDIR)$(sysconfdir)/enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg.old; \
  66         else :; \
  67         fi
  68 -       $(INSTALL_DATA) enscript.cfg $(sysconfdir)/enscript.cfg
  69 +       $(INSTALL_DATA) enscript.cfg $(DESTDIR)$(sysconfdir)/enscript.cfg
  70
  71  uninstall-local:
  72 -       rm -f $(sysconfdir)/enscript.cfg
  73 +       rm -f $(DESTDIR)$(sysconfdir)/enscript.cfg
  74
  75  enscript.cfg: $(srcdir)/enscript.cfg.in Makefile
  76         sed 's%@DATADIR@%$(datadir)%g; s%@media@%@MEDIA@%g; s%@BINDIR@%$(bindir)%g; s%@spooler@%@SPOOLER@%g; s%@pslevel@%@PSLEVEL@%g' \
  77 --- enscript-1.6.4/states/hl/Makefile.am~autotools
  78 +++ enscript-1.6.4/states/hl/Makefile.am
  79 @@ -45,11 +45,11 @@
  80  EXTRA_DIST = $(states)
  81
  82  install-data-local:
  83 -       $(top_srcdir)/mkinstalldirs $(datadir)/enscript
  84 -       $(top_srcdir)/mkinstalldirs $(datadir)/enscript/hl
  85 +       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript
  86 +       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/enscript/hl
  87         for f in $(states); do \
  88 -         $(INSTALL_DATA) $(srcdir)/$$f $(datadir)/enscript/hl/$$f; \
  89 +         $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(datadir)/enscript/hl/$$f; \
  90         done
  91
  92  uninstall-local:
  93 -       rm -rf $(datadir)/enscript/hl
  94 +       rm -rf $(DESTDIR)$(datadir)/enscript/hl