Fix real_install rules so that headers are still installed correctly …

…if includedir is overridden on the commandline.

Bug #149483 r=blizzard

nsprpub/config/rules.mk

@@ -206,7 +206,7 @@ ifdef RELEASE_BINS
 	$(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
 endif
 ifdef RELEASE_HEADERS
-	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)
+	$(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir)
 endif
 ifdef RELEASE_LIBS
 	$(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)

nsprpub/pr/include/obsolete/Makefile.in

@@ -48,7 +48,7 @@ HEADERS = $(wildcard $(srcdir)/*.h)
 RELEASE_HEADERS = $(HEADERS)
 RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete
 
-includedir := $(includedir)/obsolete
+include_subdir = obsolete
 
 include $(topsrcdir)/config/rules.mk
 

nsprpub/pr/include/private/Makefile.in

@@ -49,7 +49,7 @@ RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/private
 
 HEADERS = $(RELEASE_HEADERS) $(srcdir)/pprmwait.h $(srcdir)/primpl.h
 
-includedir := $(includedir)/private
+include_subdir = private
 
 include $(topsrcdir)/config/rules.mk