From 5c9c8f647f188dd7d99cfa17a9185f4a076226c5 Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Mon, 17 Jun 1996 17:58:53 +0000
Subject: (CPPFLAGS): Add -I$(top_srcdir)/include. (INSTALLED_LOCAL_HEADERS):
 Split into two cases based on $(installhdrsubdir).
 ($(INSTALLED_LOCAL_HEADERS)) [$(installhdrsubdir) == .]:   Linked to
 $(top_srcdir)/include.  Prefix ../ to link contents.

---
 Makeconf | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makeconf b/Makeconf
index 95e7d43d..d0a29a15 100644
--- a/Makeconf
+++ b/Makeconf
@@ -65,7 +65,7 @@ top_srcdirinc=
 else
 top_srcdirinc=-I$(top_srcdir)
 endif
-CPPFLAGS += -I. $(srcdirinc) -I.. $(top_srcdirinc) -D_GNU_SOURCE
+CPPFLAGS += -I. $(srcdirinc) -I.. $(top_srcdirinc) -I$(top_srcdir)/include -D_GNU_SOURCE
 CFLAGS += -Wall -g -O3
 
 # Decode makemode:
@@ -143,15 +143,16 @@ install: $(addprefix $(libdir)/,$(targets)) $(addprefix $(includedir)/$(installh
 # 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.
-INSTALLED_LOCAL_HEADERS=$(addprefix $(top_srcdir)/$(installhdrsubdir)/,$(installhdrs))
-libs: $(INSTALLED_LOCAL_HEADERS)
 ifeq ($(installhdrsubdir),.)
-$(INSTALLED_LOCAL_HEADERS): $(top_srcdir)/$(installhdrsubdir)/%:
-	ln -s $(dir)/$* $@
+INSTALLED_LOCAL_HEADERS=$(addprefix $(top_srcdir)/include/,$(installhdrs))
+$(INSTALLED_LOCAL_HEADERS): $(top_srcdir)/include/%:
+	ln -s ../$(dir)/$* $@
 else
+INSTALLED_LOCAL_HEADERS=$(addprefix $(top_srcdir)/$(installhdrsubdir)/,$(installhdrs))
 $(INSTALLED_LOCAL_HEADERS): $(top_srcdir)/$(installhdrsubdir)/%:
 	ln -s ../$(dir)/$* $@
 endif
+libs: $(INSTALLED_LOCAL_HEADERS)
 
 $(libdir)/$(libname).a: $(libname).a
 	$(INSTALL_DATA) $(libname).a $(libdir)/$(libname).a
-- 
cgit v1.2.3