diff options
Diffstat (limited to 'graphics/GraphicsMagick/files/patch-Makefile.in')
| -rw-r--r-- | graphics/GraphicsMagick/files/patch-Makefile.in | 97 |
1 files changed, 83 insertions, 14 deletions
diff --git a/graphics/GraphicsMagick/files/patch-Makefile.in b/graphics/GraphicsMagick/files/patch-Makefile.in index 7c5d272c8bd3..072c2e820395 100644 --- a/graphics/GraphicsMagick/files/patch-Makefile.in +++ b/graphics/GraphicsMagick/files/patch-Makefile.in @@ -1,20 +1,89 @@ ---- Makefile.in.orig 2008-05-18 17:22:51.000000000 -0400 -+++ Makefile.in 2008-06-06 18:41:23.620488084 -0400 -@@ -1775,7 +1775,7 @@ - MagickLibConfigPath = @MagickLibConfigPath@ - MagickLibPath = @MagickLibPath@ - MagickShareConfigPath = @MagickShareConfigPath@ --MagickSharePath = @MagickSharePath@ -+MagickSharePath = ${DATADIR} - MogrifyDelegate = @MogrifyDelegate@ - NM = @NM@ - NMEDIT = @NMEDIT@ -@@ -4382,7 +4382,7 @@ - @WITH_PERL_DYNAMIC_FALSE@@WITH_PERL_STATIC_TRUE@@WITH_PERL_TRUE@PERLSTATICNAME = PerlMagick +--- Makefile.in Fri Mar 18 19:36:21 2005 ++++ Makefile.in Sun Jul 24 18:21:35 2005 +@@ -466,5 +466,5 @@ + + # Install HTML files +-pkgdocdir = @MagickSharePath@ ++pkgdocdir = ${DATA_DIR}/doc/GraphicsMagick + DOCDIRS = images www www/api www/Magick++ + @WITH_PERL_TRUE@PERLMAGICK = PerlMagick +@@ -1079,5 +1079,5 @@ + + # Install arch-independent package data +-install-data-local: install-data-html ++install-data-local: + + # Uninstall arch-independent package data +--- coders/Makefile.in Fri Mar 18 19:36:16 2005 ++++ coders/Makefile.in Sun Jul 24 19:22:21 2005 +@@ -1479,5 +1479,5 @@ + install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" ++ test -z "$(pkgdir)" -o -z "$(pkg_LTLIBRARIES)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" + @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +@@ -1825,5 +1825,5 @@ + install-pkgDATA: $(pkg_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" ++ test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" + @list='$(pkg_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +@@ -1842,5 +1842,5 @@ + install-pkgdataDATA: $(pkgdata_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" ++ test -z "$(pkgdatadir)" -o -z '$(pkgdata_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" + @list='$(pkgdata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +--- filters/Makefile.in Fri Mar 18 19:36:17 2005 ++++ filters/Makefile.in Sun Jul 24 19:23:33 2005 +@@ -522,5 +522,5 @@ + install-pkgLTLIBRARIES: $(pkg_LTLIBRARIES) + @$(NORMAL_INSTALL) +- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" ++ test -z "$(pkgdir)" -o -z '$(pkg_LTLIBRARIES)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" + @list='$(pkg_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +@@ -592,5 +592,5 @@ + install-pkgDATA: $(pkg_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" ++ test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" + @list='$(pkg_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +--- magick/Makefile.in Fri Mar 18 19:36:18 2005 ++++ magick/Makefile.in Tue Jul 26 21:05:48 2005 +@@ -664,5 +664,5 @@ + + # Pkgconfig directory +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + + # Files to install in Pkgconfig directory +@@ -930,5 +930,5 @@ + install-pkgDATA: $(pkg_DATA) + @$(NORMAL_INSTALL) +- test -z "$(pkgdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" ++ test -z "$(pkgdir)" -o -z '$(pkg_DATA)' || $(MKDIR_P) "$(DESTDIR)$(pkgdir)" + @list='$(pkg_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +--- Magick++/lib/Makefile.in Fri Mar 18 19:36:13 2005 ++++ Magick++/lib/Makefile.in Tue Jul 26 21:37:39 2005 +@@ -453,5 +453,5 @@ + + # Pkgconfig directory +-pkgconfigdir = $(libdir)/pkgconfig ++pkgconfigdir = $(prefix)/libdata/pkgconfig + + # Files to install in Pkgconfig directory +--- wand/Makefile.in Fri Mar 18 19:36:20 2005 ++++ wand/Makefile.in Tue Jul 26 21:38:43 2005 +@@ -478,5 +478,5 @@ # Pkgconfig directory -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(prefix)/libdata/pkgconfig # Files to install in Pkgconfig directory - pkgconfig_DATA = \ |