- fixed typo in DESTDIR patch (libgimp locales were missing)

[packages/gimp.git] / gimp-DESTDIR.patch

diff -urN gimp-1.1.27-orig/plug-ins/perl/Makefile.PL gimp-1.1.27/plug-ins/perl/Makefile.PL
--- gimp-1.1.27-orig/plug-ins/perl/Makefile.PL	Thu Oct  5 02:15:25 2000
+++ gimp-1.1.27/plug-ins/perl/Makefile.PL	Thu Oct  5 21:05:23 2000
@@ -231,7 +231,7 @@
 	\$(CHMOD) 755 * ; \\
 	\$(MY_FIXIN) * ; \\
 	for plugin in * ; do \\
-	   $GT \"\$\$plugin\" $GT2 ; \\
+	   $GT \"\$\$plugin\" \$(DESTDIR)$GT2 ; \\
 	done
 	\$(RM_RF) inst-temp
 
diff -urN gimp-1.1.27-orig/plug-ins/perl/po/Makefile.in.in gimp-1.1.27/plug-ins/perl/po/Makefile.in.in
--- gimp-1.1.27-orig/plug-ins/perl/po/Makefile.in.in	Sat Sep 23 23:51:09 2000
+++ gimp-1.1.27/plug-ins/perl/po/Makefile.in.in	Thu Oct  5 22:15:36 2000
@@ -121,7 +121,7 @@
 	    *)     destdir=$(localedir);; \
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
 	  if test -r "$(MKINSTALLDIRS)"; then \
 	    $(MKINSTALLDIRS) $$dir; \
 	  else \
@@ -222,6 +222,9 @@
 	    mv $$lang.old.po $$lang.po; \
 	  fi; \
 	done
+
+# Temporary workaround for building under PLD GNU/Linux
+update-gmo:
 
 POTFILES: POTFILES.in
 	( if test 'x$(srcdir)' != 'x.'; then \
diff -urN gimp-1.1.27-orig/po/Makefile.in.in gimp-1.1.27/po/Makefile.in.in
--- gimp-1.1.27-orig/po/Makefile.in.in	Thu Oct  5 00:50:54 2000
+++ gimp-1.1.27/po/Makefile.in.in	Thu Oct  5 21:08:56 2000
@@ -123,7 +123,7 @@
 	    *)     destdir=$(localedir);; \
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
 	  if test -r "$(MKINSTALLDIRS)"; then \
 	    $(MKINSTALLDIRS) $$dir; \
 	  else \
diff -urN gimp-1.1.27-orig/po-libgimp/Makefile.in.in gimp-1.1.27/po-libgimp/Makefile.in.in
--- gimp-1.1.27-orig/po-libgimp/Makefile.in.in	Thu Jan 27 11:46:58 2000
+++ gimp-1.1.27/po-libgimp/Makefile.in.in	Thu Oct  5 21:09:46 2000
@@ -123,7 +123,7 @@
 	    *)     destdir=$(localedir);; \
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
 	  if test -r "$(MKINSTALLDIRS)"; then \
 	    $(MKINSTALLDIRS) $$dir; \
 	  else \
diff -urN gimp-1.1.27-orig/po-script-fu/Makefile.in.in gimp-1.1.27/po-script-fu/Makefile.in.in
--- gimp-1.1.27-orig/po-script-fu/Makefile.in.in	Sun Jun 25 21:28:30 2000
+++ gimp-1.1.27/po-script-fu/Makefile.in.in	Thu Oct  5 21:10:52 2000
@@ -130,7 +130,7 @@
 	    *)     destdir=$(localedir);; \
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
 	  if test -r "$(MKINSTALLDIRS)"; then \
 	    $(MKINSTALLDIRS) $$dir; \
 	  else \
diff -Nru gimp-1.1.32/data/brushes/Makefile.am gimp-1.1.32.new/data/brushes/Makefile.am
--- gimp-1.1.32/data/brushes/Makefile.am	Mon Dec 18 21:37:21 2000
+++ gimp-1.1.32.new/data/brushes/Makefile.am	Thu Dec 21 21:58:30 2000
@@ -56,7 +56,3 @@
 	SketchBrush-32.gih	\
 	SketchBrush-64.gih	\
 	xcf.gbr
-
-install-data-local:
-	rm -f $(brushdatadir)/round1.vbr $(brushdatadir)/pepper.gpb
-
--- gimp-1.1.32/data/brushes/Makefile.in	Wed Dec 20 20:05:04 2000
+++ gimp-1.1.32.new/data/brushes/Makefile.in	Thu Dec 21 23:08:18 2000
@@ -311,9 +311,6 @@
 
 .PHONY: files
 
-install-data-local:
-	rm -f $(brushdatadir)/round1.vbr $(brushdatadir)/pepper.gpb
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: