clean up make rules

in preparation for having automatic installation of header files

diff --git a/Makefile b/Makefile
index 12822c122b430095c97e929ae8a5195bb5c83267..de29549225a16f1a735445d895653eb4738b3f44 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ $(error The build system requires GNU Make 3.81 or later.)
 endif
 
 export DESTDIR := $(R)
+export PROJECT_NAME := freeradius
 
 # And over-ride all of the other magic.
 ifneq "$(MAKECMDGOALS)" "deb"

diff --git a/scripts/install.mk b/scripts/install.mk
index 916411563bcd7dc3d91d8c37aadd0953ec3ae6d9..9142201e39a27ade620dc50c069eff35dc761853 100644 (file)
--- a/scripts/install.mk
+++ b/scripts/install.mk
@@ -205,15 +205,13 @@ ifeq "${mandir}" ""
     mandir = ${datadir}/man
 endif
 ifeq "${docdir}" ""
-    ifneq "${PROJECT_NAME}" ""
-        docdir = ${datadir}/doc/${PROJECT_NAME}
-    endif
+    docdir = ${datadir}/doc/${PROJECT_NAME}
 endif
 ifeq "${logdir}" ""
     logdir = ${localstatedir}/log/
 endif
 ifeq "${includedir}" ""
-    includedir = ${prefix}/include
+    includedir = ${prefix}/include/${PROJECT_NAME}
 endif