From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 17 Apr 2010 22:50:03 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9625
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78cd765b0510436ad64adac1ffdb48b35f612c69;p=imagemagick

---

diff --git a/Makefile.am b/Makefile.am
index a16ed339c..f0a2e484e 100644
--- 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 b552d6776..e47828e0e 100644
--- 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 a4d968012..9ab1478bd 100644
--- 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 2f24eeff0..c413679a9 100644
--- 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)