]>
Commit | Line | Data |
---|---|---|
04a7ed40 | 1 | diff -Nur GraphicsMagick-1.2.1.orig/configure.ac GraphicsMagick-1.2.1/configure.ac |
2 | --- GraphicsMagick-1.2.1.orig/configure.ac 2008-05-05 00:14:52.000000000 +0100 | |
3 | +++ GraphicsMagick-1.2.1/configure.ac 2008-05-14 21:58:25.000000000 +0100 | |
4 | @@ -2744,7 +2744,7 @@ | |
b2e85a47 JB |
5 | # Determine path to pick up GraphicsMagick library from for use with building PerlMagick |
6 | MAGICKLIBDIR="${LIB_DIR}" | |
7 | MAGICKLIB="-L${MAGICKLIBDIR} -lGraphicsMagick" | |
8 | -if test $with_perl_static = 'yes' | |
9 | +if test $with_perl_static = 'yes' -o $with_perl_dynamic = 'yes' | |
10 | then | |
11 | # Find out where libtool hides its uninstalled libraries (as libtool_objdir) | |
12 | libtool_objdir=$objdir | |
e16d4a30 | 13 | --- GraphicsMagick-1.3.6/PerlMagick/Makefile.am.orig 2009-07-24 21:34:56.000000000 +0200 |
14 | +++ GraphicsMagick-1.3.6/PerlMagick/Makefile.am 2009-09-08 09:56:35.000000000 +0200 | |
15 | @@ -45,11 +45,12 @@ | |
b2e85a47 JB |
16 | cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) |
17 | ||
18 | install-exec-perl: $(PERLMAKEFILE) | |
19 | - ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ | |
e16d4a30 | 20 | + ( cd $(PERLMAGICK) && |
b2e85a47 JB |
21 | $(MAKE) CC='@CC@' install && \ |
22 | $(MAKE) clean && rm -f Makefile.old ) | |
23 | ||
e16d4a30 | 24 | -all-perl: perl-sources |
25 | +all-perl: perl-sources $(PERLMAKEFILE) magick/libGraphicsMagick.la | |
b2e85a47 JB |
26 | + cd $(PERLMAGICK) && $(MAKE) CC='@CC@' |
27 | ||
28 | uninstall-exec-perl: $(PERLMAKEFILE) | |
29 | echo "Uninstall not supported for PerlMagick" |