Attachment #92226 for bug #121142

Lines 30-37 Link Here

(-)PerlMagick/Makefile.am.orig (-2 / +2 lines)
30	PERLMAKEMAKER=$(PERLMAGICK)/Makefile.PL	30	PERLMAKEMAKER=$(PERLMAGICK)/Makefile.PL
31	PERLMAKEFILE=$(PERLMAGICK)/Makefile	31	PERLMAKEFILE=$(PERLMAGICK)/Makefile
32		32
33	PERLMAGICK_ALL_LOCAL_TARGETS = all-perl	33	PERLMAGICK_ALL_LOCAL_TARGETS =
34	PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS = install-exec-perl	34	PERLMAGICK_INSTALL_EXEC_LOCAL_TARGETS =
35	PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS =	35	PERLMAGICK_INSTALL_DATA_LOCAL_TARGETS =
36	PERLMAGICK_UNINSTALL_LOCAL_TARGETS = uninstall-exec-perl	36	PERLMAGICK_UNINSTALL_LOCAL_TARGETS = uninstall-exec-perl
37	PERLMAGICK_CLEAN_LOCAL_TARGETS = clean-perl	37	PERLMAGICK_CLEAN_LOCAL_TARGETS = clean-perl




   'CCFLAGS'     => "$Config{'ccflags'} @CFLAGS@",

   # Linker flags for building an executable
   'LDFLAGS'    =>  "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'ldflags'}",

   # Linker flags for building a dynamically loadable module
   'LDDLFLAGS'  => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'lddlflags'}",

   # Install PerlMagick binary into ImageMagick bin directory
   'INSTALLBIN'	=> '@BIN_DIR@',

   # Library specification
   'LIBS'	=> ['-lMagick @MAGICK_DEP_LIBS@'],

   # Perl binary name (if a Perl binary is built)
   'MAP_TARGET'	=> 'PerlMagick',

Return to bug 121142

Lines 53-68 Link Here

(-)PerlMagick/Makefile.PL.in.orig (-3 / +3 lines)
53	'CCFLAGS' => "$Config{'ccflags'} @CFLAGS@",	53	'CCFLAGS' => "$Config{'ccflags'} @CFLAGS@",
54		54
55	# Linker flags for building an executable	55	# Linker flags for building an executable
56	'LDFLAGS' => "-L@MAGICKLIBDIR@ $Config{'ldflags'}",	56	'LDFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'ldflags'}",
57		57
58	# Linker flags for building a dynamically loadable module	58	# Linker flags for building a dynamically loadable module
59	'LDDLFLAGS' => "-L@MAGICKLIBDIR@ $Config{'lddlflags'}",	59	'LDDLFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'lddlflags'}",
60		60
61	# Install PerlMagick binary into ImageMagick bin directory	61	# Install PerlMagick binary into ImageMagick bin directory
62	'INSTALLBIN' => '@BIN_DIR@',	62	'INSTALLBIN' => '@BIN_DIR@',
63		63
64	# Library specification	64	# Library specification
65	'LIBS' => ['-L@MAGICKLIBDIR@ -L../magick/.libs -lMagick @LDFLAGS@ @MAGICK_DEP_LIBS@'],	65	'LIBS' => ['-lMagick @MAGICK_DEP_LIBS@'],
66		66
67	# Perl binary name (if a Perl binary is built)	67	# Perl binary name (if a Perl binary is built)
68	'MAP_TARGET' => 'PerlMagick',	68	'MAP_TARGET' => 'PerlMagick',