From cd78178559e927c1f412b14bc6f0953db0b91d88 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 14 Feb 2016 22:53:26 +0100 Subject: [PATCH] Re-generate the Makefiles --- doc/Makefile | 16 ++++++++-------- tests/Makefile | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 6341fcb..8e198a4 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -36,10 +36,10 @@ 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) - ./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" + ./scripts/docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)configure.1" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)configure.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)project.conf.5" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)project.conf.html" distclean: @for i in $(SUBDIRS); do (cd "$$i" && \ @@ -47,10 +47,10 @@ 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) - ./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" + ./scripts/docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)configure.1" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)configure.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)project.conf.5" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)project.conf.html" $(RM) -- $(TARGETS) install: $(TARGETS) diff --git a/tests/Makefile b/tests/Makefile index 0a1a953..cd65e1f 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -21,9 +21,9 @@ $(OBJDIR)xmllint.log: ../doc/scripts/xmllint.sh clean: $(RM) -- $(shlint.log_OBJS) $(tests.log_OBJS) $(xmllint.log_OBJS) - ../doc/scripts/shlint.sh -c -P "$(PREFIX)" -- "shlint.log" - ./tests.sh -c -P "$(PREFIX)" -- "tests.log" - ../doc/scripts/xmllint.sh -c -P "$(PREFIX)" -- "xmllint.log" + ../doc/scripts/shlint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)shlint.log" + ./tests.sh -c -P "$(PREFIX)" -- "$(OBJDIR)tests.log" + ../doc/scripts/xmllint.sh -c -P "$(PREFIX)" -- "$(OBJDIR)xmllint.log" distclean: clean $(RM) -- $(TARGETS)