diff options
author | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2015-04-28 07:57:55 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2015-04-28 07:57:55 +0200 |
commit | 950148753b2eb4be3f5e63a68b3b3b9f36ea771b (patch) | |
tree | 48d0e21ea28a9d7c862ba2ecc04ac04acb02d567 /doc | |
parent | 3aa8ef714e64554d4bae7139d8e8df90bf57201e (diff) | |
parent | 37e3bea32e9078168cd2622dcc976d7d10739088 (diff) |
Merge tag 'upstream/0.8.2'
Upstream version 0.8.2
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Makefile.am | 5 | ||||
-rw-r--r-- | doc/Makefile.in | 5 | ||||
-rwxr-xr-x | doc/release.sh.in | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 5814a0c..fb9e035 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -23,8 +23,9 @@ distclean-local: ## Install doc files install-data-local: - $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local - $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/" + $(MKDIR_P) "$(DESTDIR)$(docdir)/html/search" ## Didn't work with installdirs-local + $(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.map html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/" + $(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/" -$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/" diff --git a/doc/Makefile.in b/doc/Makefile.in index 004da21..28ce99f 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -413,8 +413,9 @@ distclean-local: rm -f config.{log,status} release.sh Doxyfile install-data-local: - $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local - $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/" + $(MKDIR_P) "$(DESTDIR)$(docdir)/html/search" ## Didn't work with installdirs-local + $(INSTALL_DATA) html/*.css html/*.html html/*.js html/*.map html/*.md5 html/*.png "$(DESTDIR)$(docdir)/html/" + $(INSTALL_DATA) html/search/* "$(DESTDIR)$(docdir)/html/search/" -$(INSTALL_DATA) *.qch "$(DESTDIR)$(docdir)/" uninstall-local: diff --git a/doc/release.sh.in b/doc/release.sh.in index e344b6b..d970773 100755 --- a/doc/release.sh.in +++ b/doc/release.sh.in @@ -12,13 +12,17 @@ rm -Rf "${distdir}" "${distdir}.zip" "${MAKE}" || exit 1 # Copy -mkdir -p "${distdir}/html" +mkdir -p "${distdir}/html/search" cp \ html/*.css \ html/*.html \ + html/*.js \ + html/*.map \ + html/*.md5 \ html/*.png \ \ "${distdir}/html/" || exit 1 +cp -R html/search/ "${distdir}/html/" || exit 1 # Package zip -r "${distdir}.zip" "${distdir}" || exit 1 |