]>
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 | |
04a7ed40 | 13 | diff -Nur GraphicsMagick-1.2.1.orig/PerlMagick/Makefile.am GraphicsMagick-1.2.1/PerlMagick/Makefile.am |
14 | --- GraphicsMagick-1.2.1.orig/PerlMagick/Makefile.am 2007-10-07 01:52:07.000000000 +0100 | |
15 | +++ GraphicsMagick-1.2.1/PerlMagick/Makefile.am 2008-05-14 22:03:00.000000000 +0100 | |
16 | @@ -39,11 +39,12 @@ | |
b2e85a47 JB |
17 | cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) |
18 | ||
19 | install-exec-perl: $(PERLMAKEFILE) | |
20 | - ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ | |
21 | + ( cd $(PERLMAGICK) && \ | |
22 | $(MAKE) CC='@CC@' install && \ | |
23 | $(MAKE) clean && rm -f Makefile.old ) | |
24 | ||
25 | -all-perl: | |
26 | +all-perl: $(PERLMAKEFILE) magick/libGraphicsMagick.la | |
27 | + cd $(PERLMAGICK) && $(MAKE) CC='@CC@' | |
28 | ||
29 | uninstall-exec-perl: $(PERLMAKEFILE) | |
30 | echo "Uninstall not supported for PerlMagick" |