(no commit message)

diff --git a/Makefile.am b/Makefile.am
index f6f481019885104dbb71dc71edda3484502f8277..3340ed64ec344711a1a9933acd9017ed8cf6fd4d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -180,7 +180,9 @@ doc_DATA = \
        NEWS.txt
 
 if MAINTAINER_MODE
-MAINTAINER_TARGETS = magick-version
+MAINTAINER_TARGETS = \
+  magick-version \
+  $(PERLMAGICK_MAINTAINER_TARGETS)
 endif
 
 all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)

diff --git a/Makefile.in b/Makefile.in
index ec32664f0fd587631a8eb9fc7d92fb2220e4f23e..3bb514525f500e7f8d832fcd2176df4d61e5a753 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4544,6 +4544,7 @@ TESTS_EXTRA_DIST = \
        $(TESTS_TESTS)
 
 TESTS_CLEANFILES = 
+PERLMAGICK_MAINTAINER_TARGETS = $(top_srcdir)/$(PERLMAGICK)/Magick.pm
 @WITH_PERL_TRUE@PERLMAGICK = PerlMagick
 @WITH_PERL_TRUE@PERLMAKEMAKER = $(PERLMAGICK)/Makefile.PL
 @WITH_PERL_TRUE@PERLMAKEFILE = $(PERLMAGICK)/Makefile
@@ -4581,7 +4582,10 @@ doc_DATA = \
        ChangeLog \
        NEWS.txt
 
-@MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = magick-version
+@MAINTAINER_MODE_TRUE@MAINTAINER_TARGETS = \
+@MAINTAINER_MODE_TRUE@  magick-version \
+@MAINTAINER_MODE_TRUE@  $(PERLMAGICK_MAINTAINER_TARGETS)
+
 
 # Non-Automake subdirectories to distribute
 DISTDIRS = images scenes scripts www PerlMagick
@@ -11030,6 +11034,12 @@ perl-sources:
        fi ; \
        touch perl-sources
 
+$(top_srcdir)/$(PERLMAGICK)/Magick.pm : $(PERLMAGICK)/Magick.pm
+  @if test -n "$(VPATH)" ; then \
+      echo "Updating  $(PERLMAGICK)/Magick.pm ..." ; \
+      cp $(PERLMAGICK)/Magick.pm $(top_srcdir)/$(PERLMAGICK)/Magick.pm ; \
+  fi
+
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@       cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
 

diff --git a/PerlMagick/Makefile.am b/PerlMagick/Makefile.am
index 20aafb3a3667421fe18103631b7f8678f357ff28..c451b9fd35a52e6bc4d9e2f7172907705cce25d4 100644 (file)
--- a/PerlMagick/Makefile.am
+++ b/PerlMagick/Makefile.am
@@ -26,6 +26,14 @@ perl-sources:
        fi ; \
        touch perl-sources
 
+$(top_srcdir)/$(PERLMAGICK)/Magick.pm : $(PERLMAGICK)/Magick.pm
+  @if test -n "$(VPATH)" ; then \
+      echo "Updating  $(PERLMAGICK)/Magick.pm ..." ; \
+      cp $(PERLMAGICK)/Magick.pm $(top_srcdir)/$(PERLMAGICK)/Magick.pm ; \
+  fi
+
+PERLMAGICK_MAINTAINER_TARGETS=$(top_srcdir)/$(PERLMAGICK)/Magick.pm
+
 if WITH_PERL
 
 PERLMAGICK=PerlMagick

diff --git a/config/configure.xml b/config/configure.xml
index 4b182a6bae122d06f391854a6c3e6ab0752cb861..8c1471f6d3da64d1d76c7e73bdb35e0b8f1fb97f 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <configure name="LIB_VERSION" value="0x660"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,0,1"/>
   <configure name="RELEASE_DATE" value="2010-03-03"/>
-  <configure name="CONFIGURE" value="./configure  '--enable-maintainer-mode'"/>
+  <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.6.0"/>