(no commit message)

diff --git a/Makefile.am b/Makefile.am
index a16ed339c538f5a476e7fe1f2dbf9fd852ba7a4a..f0a2e484e7831bb4c554acd1d56f653ae66661f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -337,10 +337,9 @@ DIST_ARCHIVE_RPM= \
 .PHONY: rpm
 rpm:
        rm -rf $(RPMDIR)
-       mkdir $(RPMDIR)
-       mkdir $(RPMDIR)/BUILD
-       mkdir $(RPMDIR)/RPMS
-       $(MAKE) distcheck
+       $(MKDIR_P) $(RPMDIR)
+       $(MKDIR_P) $(RPMDIR)/BUILD
+       $(MKDIR_P) $(RPMDIR)/RPMS
        $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
        rm -rf rpmbuild
        @echo ==============================================================

diff --git a/Makefile.in b/Makefile.in
index b552d6776938781c27e8466b29c927e9eb116a87..e47828e0e2d8646b1494bdcb48bad60616c8b180 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11039,8 +11039,7 @@ perl-sources:
 
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@       ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@       $(MAKE) CC='@CC@' install && \
-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@       $(MAKE) clean && rm -f  Makefile.old )
+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@       $(MAKE) CC='@CC@' install )
 
 @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: perl-sources
 
@@ -11201,10 +11200,9 @@ $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
 @RPM_DELEGATE_TRUE@.PHONY: rpm
 @RPM_DELEGATE_TRUE@rpm:
 @RPM_DELEGATE_TRUE@    rm -rf $(RPMDIR)
-@RPM_DELEGATE_TRUE@    mkdir $(RPMDIR)
-@RPM_DELEGATE_TRUE@    mkdir $(RPMDIR)/BUILD
-@RPM_DELEGATE_TRUE@    mkdir $(RPMDIR)/RPMS
-@RPM_DELEGATE_TRUE@    $(MAKE) distcheck
+@RPM_DELEGATE_TRUE@    $(MKDIR_P) $(RPMDIR)
+@RPM_DELEGATE_TRUE@    $(MKDIR_P) $(RPMDIR)/BUILD
+@RPM_DELEGATE_TRUE@    $(MKDIR_P) $(RPMDIR)/RPMS
 @RPM_DELEGATE_TRUE@    $(RPM) --define="_sourcedir `pwd`" --define="_rpmdir `pwd`/$(RPMDIR)/RPMS" --define="_builddir `pwd`/$(RPMDIR)/BUILD" --nodeps -bb ImageMagick.spec
 @RPM_DELEGATE_TRUE@    rm -rf rpmbuild
 @RPM_DELEGATE_TRUE@    @echo ==============================================================

diff --git a/config/configure.xml b/config/configure.xml
index a4d96801212e41d23552014889410d344acaa1a3..9ab1478bd4d5afd9bdfd2fe509eaf44b48968be6 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,8 +9,8 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x661"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,1,5"/>
-  <configure name="RELEASE_DATE" value="2010-04-16"/>
-  <configure name="CONFIGURE" value="./configure "/>
+  <configure name="RELEASE_DATE" value="2010-04-17"/>
+  <configure name="CONFIGURE" value="./configure  '--enable-maintainer-mode'"/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
   <configure name="VERSION" value="6.6.1"/>

diff --git a/magick/version.h b/magick/version.h
index 2f24eeff02659fc3a4e2e65f865bf4dc66c329d1..c413679a9dc724800824750ae07f6ffbd5b35183 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@ extern "C" {
 #define MagickLibAddendum  "-5"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
-#define MagickReleaseDate  "2010-04-16"
-#define MagickChangeDate   "20100415"
+#define MagickReleaseDate  "2010-04-17"
+#define MagickChangeDate   "20100417"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.1/index.html"
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)