diff options
| author | javi%netscape.com <devnull@localhost> | 2001-04-10 22:28:52 +0000 |
|---|---|---|
| committer | javi%netscape.com <devnull@localhost> | 2001-04-10 22:28:52 +0000 |
| commit | 0f11680a508ee7fedf30600c0fca719a446aa26c (patch) | |
| tree | dedbfe7446806efdff85def9e544256e4a60a0b0 | |
| parent | 96f549703ab4d80b9c6056a7da637fe2803532a2 (diff) | |
| download | nss-hg-0f11680a508ee7fedf30600c0fca719a446aa26c.tar.gz | |
Fix for Bug 75300
| -rw-r--r-- | security/coreconf/WIN32.mk | 3 | ||||
| -rw-r--r-- | security/coreconf/headers.mk | 4 | ||||
| -rw-r--r-- | security/coreconf/ruleset.mk | 2 | ||||
| -rw-r--r-- | security/coreconf/source.mk | 17 |
4 files changed, 21 insertions, 5 deletions
diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk index 7bc23a334..61563e49a 100644 --- a/security/coreconf/WIN32.mk +++ b/security/coreconf/WIN32.mk @@ -93,9 +93,6 @@ DEFINES += -DWIN32 # DEFINES += -D_WINDOWS -ifdef MOZILLA_CLIENT -INCLUDES += -I$(SOURCE_XP_DIR)/include -endif # override default, which is ASFLAGS = CFLAGS AS = ml.exe diff --git a/security/coreconf/headers.mk b/security/coreconf/headers.mk index f09d5f6ee..76f2d1483 100644 --- a/security/coreconf/headers.mk +++ b/security/coreconf/headers.mk @@ -52,3 +52,7 @@ endif # INCLUDES += -I$(SOURCE_XPPRIVATE_DIR) + +ifdef MOZILLA_CLIENT +INCLUDES += -I$(SOURCE_XP_DIR)/include +endif diff --git a/security/coreconf/ruleset.mk b/security/coreconf/ruleset.mk index c39388fd2..3733c41fd 100644 --- a/security/coreconf/ruleset.mk +++ b/security/coreconf/ruleset.mk @@ -277,8 +277,6 @@ else endif endif -INCLUDES += -I$(SOURCE_XP_DIR)/include/nspr - ifdef SYSTEM_INCL_DIR YOPT = -Y$(SYSTEM_INCL_DIR) endif diff --git a/security/coreconf/source.mk b/security/coreconf/source.mk index 825ebc5ec..6c9ec0fed 100644 --- a/security/coreconf/source.mk +++ b/security/coreconf/source.mk @@ -39,13 +39,17 @@ # <user_source_tree> master import/export directory prefix # +ifndef SOURCE_PREFIX SOURCE_PREFIX = $(CORE_DEPTH)/../dist +endif # # <user_source_tree> cross-platform (xp) master import/export directory # +ifndef SOURCE_XP_DIR SOURCE_XP_DIR = $(SOURCE_PREFIX) +endif # # <user_source_tree> cross-platform (xp) import/export directories @@ -66,15 +70,28 @@ endif # <user_source_tree> machine-dependent (md) master import/export directory # +ifndef SOURCE_MD_DIR SOURCE_MD_DIR = $(SOURCE_PREFIX)/$(PLATFORM) +endif # # <user_source_tree> machine-dependent (md) import/export directories # +#This is where we install built executables and (for Windows only) DLLs. +ifndef SOURCE_BIN_DIR SOURCE_BIN_DIR = $(SOURCE_MD_DIR)/bin +endif + +#This is where we install built libraries (.a, .so, .lib). +ifndef SOURCE_LIB_DIR SOURCE_LIB_DIR = $(SOURCE_MD_DIR)/lib +endif + +# This is where NSPR header files are found. +ifndef SOURCE_MDHEADERS_DIR SOURCE_MDHEADERS_DIR = $(SOURCE_MD_DIR)/include +endif ####################################################################### # Master <component>-specific source release directories and files # |