2008-12-08 Thomas Schwinge <tschwinge@gnu.org>

	* Makeconf (local-installhdrsubdir): Always put files below `include/'.

2 files changed, 6 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 73b52905..92f027fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-08  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* Makeconf (local-installhdrsubdir): Always put files below `include/'.
+
 2008-11-17  Thomas Schwinge  <tschwinge@gnu.org>
 
 	* configure.in: Unconditionally use the provided `install-sh'.  Make
diff --git a/Makeconf b/Makeconf
index 89c44e4e..e9b20452 100644
--- a/Makeconf
+++ b/Makeconf
@@ -246,17 +246,12 @@ $(includedir)/$(installhdrsubdir): $(includedir)
 # Arrange to have the headers installed locally anytime we build the library.
 # Not quite perfect, but at least it does end up getting done; and once done
 # it never needs to be repeated for a particular header.
-ifeq ($(installhdrsubdir),.)
-local-installhdrsubdir = include
-else
-local-installhdrsubdir = $(installhdrsubdir)
-endif
-ifneq ($(local-installhdrsubdir),$(dir))
+local-installhdrsubdir = include/$(installhdrsubdir)
 INSTALLED_LOCAL_HEADERS := $(installhdrs:%=../$(local-installhdrsubdir)/%)
 $(INSTALLED_LOCAL_HEADERS): ../$(local-installhdrsubdir)/%: ../config.make
 	@rm -f $@
+	@test -d $(@D)/ || $(MKINSTALLDIRS) $(@D)
 	echo '#include "../$(dir)/$*"' > $@
-endif
 libs: $(INSTALLED_LOCAL_HEADERS)
 # Make sure we make those before compiling, since -MG will be unhelpful.
 $(patsubst %.o,%.d,$(filter %.o,$(OBJS))): $(INSTALLED_LOCAL_HEADERS)