From 639d03f007c12906badea0608ac409c1a5ceccba Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 20 Jan 2016 01:05:59 +0100
Subject: [PATCH] Re-generate the Makefiles

---
 Makefile     |  1 -
 doc/Makefile | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 14e70a8..537dffb 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ dist:
 	$(LN) -s -- "$$PWD" $(OBJDIR)$(PACKAGE)-$(VERSION)
 	@cd $(OBJDIR). && $(TAR) -czvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz -- \
 		$(PACKAGE)-$(VERSION)/doc/Makefile \
-		$(PACKAGE)-$(VERSION)/doc/docbook.sh \
 		$(PACKAGE)-$(VERSION)/doc/configure.css.xml \
 		$(PACKAGE)-$(VERSION)/doc/configure.xml \
 		$(PACKAGE)-$(VERSION)/doc/manual.css.xml \
diff --git a/doc/Makefile b/doc/Makefile
index 937726b..6341fcb 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -19,7 +19,7 @@ subdirs:
 		else $(MAKE); fi) || exit; done
 
 $(OBJDIR)configure.1: configure.xml
-	./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)configure.1"
+	./scripts/docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)configure.1"
 
 $(OBJDIR)configure.html: configure.css.xml configure.xml manual.css.xml
 	./docbook.sh -P "$(PREFIX)" -- "$(OBJDIR)configure.html"
@@ -36,7 +36,7 @@ clean:
 		$(MAKE) OBJDIR="$(OBJDIR)$$i/" clean; \
 		else $(MAKE) clean; fi) || exit; done
 	$(RM) -- $(configure.1_OBJS) $(configure.html_OBJS) $(project.conf.5_OBJS) $(project.conf.html_OBJS)
-	./docbook.sh -c -P "$(PREFIX)" -- "configure.1"
+	./scripts/docbook.sh -c -P "$(PREFIX)" -- "configure.1"
 	./docbook.sh -c -P "$(PREFIX)" -- "configure.html"
 	./docbook.sh -c -P "$(PREFIX)" -- "project.conf.5"
 	./docbook.sh -c -P "$(PREFIX)" -- "project.conf.html"
@@ -47,7 +47,7 @@ distclean:
 		$(MAKE) OBJDIR="$(OBJDIR)$$i/" distclean; \
 		else $(MAKE) distclean; fi) || exit; done
 	$(RM) -- $(configure.1_OBJS) $(configure.html_OBJS) $(project.conf.5_OBJS) $(project.conf.html_OBJS)
-	./docbook.sh -c -P "$(PREFIX)" -- "configure.1"
+	./scripts/docbook.sh -c -P "$(PREFIX)" -- "configure.1"
 	./docbook.sh -c -P "$(PREFIX)" -- "configure.html"
 	./docbook.sh -c -P "$(PREFIX)" -- "project.conf.5"
 	./docbook.sh -c -P "$(PREFIX)" -- "project.conf.html"
@@ -58,7 +58,7 @@ install: $(TARGETS)
 		if [ -n "$(OBJDIR)" ]; then \
 		$(MAKE) OBJDIR="$(OBJDIR)$$i/" install; \
 		else $(MAKE) install; fi) || exit; done
-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)configure.1"
+	./scripts/docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)configure.1"
 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)configure.html"
 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)project.conf.5"
 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)project.conf.html"
@@ -68,7 +68,7 @@ uninstall:
 		if [ -n "$(OBJDIR)" ]; then \
 		$(MAKE) OBJDIR="$(OBJDIR)$$i/" uninstall; \
 		else $(MAKE) uninstall; fi) || exit; done
-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "configure.1"
+	./scripts/docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "configure.1"
 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "configure.html"
 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "project.conf.5"
 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "project.conf.html"