From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 11 Jul 2015 23:40:28 +0000 (+0000)
Subject: https://github.com/ImageMagick/ImageMagick/pull/17
X-Git-Tag: 7.0.1-0~797
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7476bd5b61bad55f7c2149c20116ee32b3da391;p=imagemagick

https://github.com/ImageMagick/ImageMagick/pull/17
---

diff --git a/Makefile.in b/Makefile.in
index 46f078ae4..27f49c5a6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4891,7 +4891,7 @@ magickpptopinc_HEADERS = $(MAGICKPP_TOP_INCHEADERS)
 MAGICKPP_TOP_INCHEADERS_OPT = \
   Magick++/lib/Magick++.h
 
-magickppincdir = $(topincludedir)/Magick++
+magickppincdir = $(INCLUDE_PATH)/Magick++
 magickppinc_HEADERS = $(MAGICKPP_INCHEADERS)
 MAGICKPP_INCHEADERS_OPT = \
 	Magick++/lib/Magick++/Blob.h \
diff --git a/configure b/configure
index f7ba224ed..2c7af4043 100755
--- a/configure
+++ b/configure
@@ -4379,7 +4379,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=19149M
+MAGICK_SVN_REVISION=19161:19162
 
 
 # Substitute library versioning