gimp-DESTDIR.patch

   1 diff -Nur gimp-1.2.2.orig/data/brushes/Makefile.am gimp-1.2.2/data/brushes/Makefile.am
   2 --- gimp-1.2.2.orig/data/brushes/Makefile.am    Sat Apr  7 13:24:36 2001
   3 +++ gimp-1.2.2/data/brushes/Makefile.am Fri Aug  3 22:44:15 2001
   4 @@ -59,7 +59,3 @@
   5         SketchBrush-32.gih      \
   6         SketchBrush-64.gih      \
   7         xcf.gbr
   8 -
   9 -install-data-local:
  10 -       rm -f $(brushdatadir)/round1.vbr $(brushdatadir)/pepper.gpb
  11 -
  12 diff -Nur gimp-1.2.2.orig/data/brushes/Makefile.in gimp-1.2.2/data/brushes/Makefile.in
  13 --- gimp-1.2.2.orig/data/brushes/Makefile.in    Thu Jul 26 21:37:17 2001
  14 +++ gimp-1.2.2/data/brushes/Makefile.in Fri Aug  3 22:44:15 2001
  15 @@ -313,9 +313,6 @@
  16
  17  .PHONY: files
  18
  19 -install-data-local:
  20 -       rm -f $(brushdatadir)/round1.vbr $(brushdatadir)/pepper.gpb
  21 -
  22  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  23  # Otherwise a system limit (for SysV at least) may be exceeded.
  24  .NOEXPORT:
  25 diff -Nur gimp-1.2.2.orig/plug-ins/perl/Makefile.PL gimp-1.2.2/plug-ins/perl/Makefile.PL
  26 --- gimp-1.2.2.orig/plug-ins/perl/Makefile.PL   Thu Jul 26 22:17:43 2001
  27 +++ gimp-1.2.2/plug-ins/perl/Makefile.PL        Fri Aug  3 22:44:15 2001
  28 @@ -233,7 +233,7 @@
  29         \$(CHMOD) 755 * ; \\
  30         \$(MY_FIXIN) * ; \\
  31         for plugin in * ; do \\
  32 -          $GT \"\$\$plugin\" $GT2 ; \\
  33 +          $GT \"\$\$plugin\" \$(DESTDIR)$GT2 ; \\
  34         done
  35         \$(RM_RF) inst-temp
  36
  37 diff -Nur gimp-1.2.2.orig/plug-ins/perl/po/Makefile.in.in gimp-1.2.2/plug-ins/perl/po/Makefile.in.in
  38 --- gimp-1.2.2.orig/plug-ins/perl/po/Makefile.in.in     Tue Jun 19 23:51:04 2001
  39 +++ gimp-1.2.2/plug-ins/perl/po/Makefile.in.in  Fri Aug  3 22:44:15 2001
  40 @@ -121,7 +121,7 @@
  41             *)     destdir=$(localedir);; \
  42           esac; \
  43           lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
  44 -         dir=$$destdir/$$lang/LC_MESSAGES; \
  45 +         dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
  46           if test -r "$(MKINSTALLDIRS)"; then \
  47             $(MKINSTALLDIRS) $$dir; \
  48           else \
  49 @@ -223,6 +223,9 @@
  50           fi; \
  51         done
  52
  53 +# Temporary workaround for building under PLD GNU/Linux
  54 +update-gmo:
  55 +
  56  POTFILES: POTFILES.in
  57         ( if test 'x$(srcdir)' != 'x.'; then \
  58             posrcprefix='$(top_srcdir)/'; \
  59 diff -Nur gimp-1.2.2.orig/po-libgimp/Makefile.in.in gimp-1.2.2/po-libgimp/Makefile.in.in
  60 --- gimp-1.2.2.orig/po-libgimp/Makefile.in.in   Thu Jan 27 11:46:58 2000
  61 +++ gimp-1.2.2/po-libgimp/Makefile.in.in        Fri Aug  3 22:44:15 2001
  62 @@ -123,7 +123,7 @@
  63             *)     destdir=$(localedir);; \
  64           esac; \
  65           lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
  66 -         dir=$$destdir/$$lang/LC_MESSAGES; \
  67 +         dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
  68           if test -r "$(MKINSTALLDIRS)"; then \
  69             $(MKINSTALLDIRS) $$dir; \
  70           else \
  71 diff -Nur gimp-1.2.2.orig/po-script-fu/Makefile.in.in gimp-1.2.2/po-script-fu/Makefile.in.in
  72 --- gimp-1.2.2.orig/po-script-fu/Makefile.in.in Sat Jun 24 12:46:57 2000
  73 +++ gimp-1.2.2/po-script-fu/Makefile.in.in      Fri Aug  3 22:44:15 2001
  74 @@ -130,7 +130,7 @@
  75             *)     destdir=$(localedir);; \
  76           esac; \
  77           lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
  78 -         dir=$$destdir/$$lang/LC_MESSAGES; \
  79 +         dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
  80           if test -r "$(MKINSTALLDIRS)"; then \
  81             $(MKINSTALLDIRS) $$dir; \
  82           else \
  83 --- gimp-1.2.3/gimptool-1.2.in~ Tue Feb 12 09:58:38 2002
  84 +++ gimp-1.2.3/gimptool-1.2.in  Tue Feb 12 09:58:38 2002
  85 @@ -228,27 +228,27 @@
  86        case $1 in
  87          --*install-bin)
  88            install_cmd="@INSTALL_PROGRAM@"
  89 -          install_dir="$HOME/@gimpdir@/plug-ins"
  90 +          install_dir="${DESTDIR}${HOME}/@gimpdir@/plug-ins"
  91            ;;
  92          --install-bin-strip)
  93            install_cmd="@INSTALL_PROGRAM@ -s"
  94 -          install_dir="$HOME/@gimpdir@/plug-ins"
  95 +          install_dir="${DESTDIR}${HOME}/@gimpdir@/plug-ins"
  96            ;;
  97          --*install-admin-bin)
  98            install_cmd="@INSTALL_PROGRAM@"
  99 -          install_dir="$gimpplugindir/plug-ins"
 100 +          install_dir="${DESTDIR}${gimpplugindir}/plug-ins"
 101            ;;
 102          --install-admin-bin-strip)
 103            install_cmd="@INSTALL_PROGRAM@ -s"
 104 -          install_dir="$gimpplugindir/plug-ins"
 105 +          install_dir="${DESTDIR}${gimpplugindir}/plug-ins"
 106            ;;
 107          --*install-script)
 108            install_cmd="@INSTALL_DATA@"
 109 -          install_dir="$HOME/@gimpdir@/scripts"
 110 +          install_dir="${DESTDIR}${HOME}/@gimpdir@/scripts"
 111            ;;
 112          --*install-admin-script)
 113            install_cmd="@INSTALL_DATA@"
 114 -          install_dir="$gimpdatadir/scripts"
 115 +          install_dir="${DESTDIR}${gimpdatadir}/scripts"
 116            ;;
 117        esac
 118        case $1 in
 119 @@ -256,7 +256,7 @@
 120            shift
 121            if test "x$1" != "x"; then
 122              if test -f "$install_dir/$1"; then
 123 -              cmd="rm -f $DESTDIR$install_dir/$1"
 124 +              cmd="rm -f ${DESTDIR}${install_dir}/$1"
 125                test $quiet = "yes" || echo $cmd
 126                test $donothing = "yes" || exec $cmd
 127              else
 128 @@ -300,9 +300,9 @@
 129          --build | --build-noui | --build-nogimpui)
 130            install_dir=. ;;
 131          --install | --install-noui | --install-nogimpui)
 132 -          install_dir="$HOME/@gimpdir@/plug-ins" ;;
 133 +          install_dir="${DESTDIR}${HOME}/@gimpdir@/plug-ins" ;;
 134          --install-admin | --install-admin-noui | --install-admin-nogimpui)
 135 -          install_dir="$gimpplugindir/plug-ins" ;;
 136 +          install_dir="${DESTDIR}${gimpplugindir}/plug-ins" ;;
 137        esac
 138        noui=`echo $opt | sed 's/^.*\(noui\)$/\1/'`
 139        nogimpui=`echo $opt | sed 's/^.*\(nogimpui\)$/\1/'`