From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 16 Dec 2017 15:22:07 +0000 (-0500)
Subject: Include www/assets in the build
X-Git-Tag: 7.0.7-15~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3cae704c5ccba48f7f799a64e700eeb4e64cac9b;p=imagemagick

Include www/assets in the build
---

diff --git a/Makefile.am b/Makefile.am
index 3f2f534ed..553b11292 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -240,7 +240,7 @@ dist-hook:
 # Install HTML files
 pkgdocdir = $(DOCUMENTATION_PATH)
 DOCDIRSDOXYGEN = www/api/MagickCore www/api/MagickWand
-DOCDIRSMANUAL = images images/patterns www www/css www/js www/api www/source www/Magick++
+DOCDIRSMANUAL = images images/patterns www www/assets www/api www/source www/Magick++
 DOCDIRS= $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN)
 
 if INSTALL_DOC
diff --git a/Makefile.in b/Makefile.in
index 0e57fa65f..fc1f478b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5150,7 +5150,7 @@ DISTDIRS = images scripts www PerlMagick
 # Install HTML files
 pkgdocdir = $(DOCUMENTATION_PATH)
 DOCDIRSDOXYGEN = www/api/MagickCore www/api/MagickWand
-DOCDIRSMANUAL = images images/patterns www www/css www/js www/api www/source www/Magick++
+DOCDIRSMANUAL = images images/patterns www www/assets www/api www/source www/Magick++
 DOCDIRS = $(DOCDIRSMANUAL) $(DOCDIRSDOXYGEN)
 @INSTALL_DOC_TRUE@HTML_INSTALL_DATA_TARGETS = install-data-html
 
diff --git a/configure b/configure
index a7a1f397e..dba4e3346 100755
--- a/configure
+++ b/configure
@@ -4559,7 +4559,7 @@ MAGICK_PATCHLEVEL_VERSION=15
 
 MAGICK_VERSION=7.0.7-15
 
-MAGICK_GIT_REVISION=21896:18b6989dc:20171215
+MAGICK_GIT_REVISION=21903:a70504060:20171216
 
 
 # Substitute library versioning