]>
Commit | Line | Data |
---|---|---|
b2e85a47 JB |
1 | --- GraphicsMagick-1.1.7/configure.ac.orig 2005-03-19 01:35:06.000000000 +0100 |
2 | +++ GraphicsMagick-1.1.7/configure.ac 2006-01-28 19:25:30.383390250 +0100 | |
3 | @@ -2581,7 +2581,7 @@ | |
4 | # Determine path to pick up GraphicsMagick library from for use with building PerlMagick | |
5 | MAGICKLIBDIR="${LIB_DIR}" | |
6 | MAGICKLIB="-L${MAGICKLIBDIR} -lGraphicsMagick" | |
7 | -if test $with_perl_static = 'yes' | |
8 | +if test $with_perl_static = 'yes' -o $with_perl_dynamic = 'yes' | |
9 | then | |
10 | # Find out where libtool hides its uninstalled libraries (as libtool_objdir) | |
11 | libtool_objdir=$objdir | |
12 | --- GraphicsMagick-1.1.7/Makefile.am.orig 2004-09-12 19:25:25.000000000 +0200 | |
13 | +++ GraphicsMagick-1.1.7/Makefile.am 2004-09-19 12:25:10.924398496 +0200 | |
14 | @@ -45,11 +45,12 @@ | |
15 | cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) | |
16 | ||
17 | install-exec-perl: $(PERLMAKEFILE) | |
18 | - ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ | |
19 | + ( cd $(PERLMAGICK) && \ | |
20 | $(MAKE) CC='@CC@' install && \ | |
21 | $(MAKE) clean && rm -f Makefile.old ) | |
22 | ||
23 | -all-perl: | |
24 | +all-perl: $(PERLMAKEFILE) magick/libGraphicsMagick.la | |
25 | + cd $(PERLMAGICK) && $(MAKE) CC='@CC@' | |
26 | ||
27 | uninstall-exec-perl: $(PERLMAKEFILE) | |
28 | echo "Uninstall not supported for PerlMagick" |