diff options
| author | seawood%netscape.com <devnull@localhost> | 2002-06-13 10:59:37 +0000 |
|---|---|---|
| committer | seawood%netscape.com <devnull@localhost> | 2002-06-13 10:59:37 +0000 |
| commit | 9c0255c73bd07f0485a194ab87088bcd1bd44f9f (patch) | |
| tree | 5ef77e76de2d98a390db4ba2639e0fbe00fd5197 | |
| parent | 6002072f02ef4765d81feebd66eebb4b143bcad8 (diff) | |
| download | nspr-hg-9c0255c73bd07f0485a194ab87088bcd1bd44f9f.tar.gz | |
Fix real_install rules so that headers are still installed correctly if includedir is overridden on the commandline.
Bug #149483 r=blizzard a=valeski
| -rw-r--r-- | config/rules.mk | 2 | ||||
| -rw-r--r-- | pr/include/obsolete/Makefile.in | 2 | ||||
| -rw-r--r-- | pr/include/private/Makefile.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/rules.mk b/config/rules.mk index ffd63dfc..29e56a79 100644 --- a/config/rules.mk +++ b/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) diff --git a/pr/include/obsolete/Makefile.in b/pr/include/obsolete/Makefile.in index 88342b0b..f2d78313 100644 --- a/pr/include/obsolete/Makefile.in +++ b/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 diff --git a/pr/include/private/Makefile.in b/pr/include/private/Makefile.in index 31c82552..cafb86c8 100644 --- a/pr/include/private/Makefile.in +++ b/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 |