diff options
| author | nicolson%netscape.com <devnull@localhost> | 2001-06-29 01:53:01 +0000 |
|---|---|---|
| committer | nicolson%netscape.com <devnull@localhost> | 2001-06-29 01:53:01 +0000 |
| commit | 3b48bde1663118eda7f12ffb81a9ad2c10d9283a (patch) | |
| tree | 744da297a3c458afa35b5b30bab8d9573cfc97e2 | |
| parent | 766f758254f8b06ee8d8c3316d4b4cb8fd766508 (diff) | |
| download | nss-hg-3b48bde1663118eda7f12ffb81a9ad2c10d9283a.tar.gz | |
Changes to make JSS more easily releasable.
Also, get rid of NS_USE_JDK_TOOLSET.
| -rw-r--r-- | security/coreconf/jdk.mk | 3 | ||||
| -rw-r--r-- | security/coreconf/rules.mk | 35 |
2 files changed, 22 insertions, 16 deletions
diff --git a/security/coreconf/jdk.mk b/security/coreconf/jdk.mk index 9cbfc3dfe..755243fca 100644 --- a/security/coreconf/jdk.mk +++ b/security/coreconf/jdk.mk @@ -399,7 +399,6 @@ endif endif -ifdef NS_USE_JDK_TOOLSET ####################################################################### # [5] Define JDK "Core Components" toolset; # # (always allow a user to override these values) # @@ -608,5 +607,3 @@ ifeq ($(SERIALVER),) SERIALVER_FLAGS = $(JDK_THREADING_MODEL_OPT) SERIALVER = $(SERIALVER_PROG) $(SERIALVER_FLAGS) endif - -endif diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 49e637e39..4fdb48f0f 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -242,21 +242,30 @@ endif release_policy:: +$(LOOP_OVER_DIRS) -release_md:: -ifdef LIBRARY - $(INSTALL) -m 444 $(LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) -endif -ifdef SHARED_LIBRARY - $(INSTALL) -m 555 $(SHARED_LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) -endif -ifdef IMPORT_LIBRARY - $(INSTALL) -m 555 $(IMPORT_LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) +ifndef NO_MD_RELEASE + ifdef LIBRARY + MD_LIB_RELEASE_FILES += $(LIBRARY) + endif + ifdef SHARED_LIBRARY + MD_LIB_RELEASE_FILES += $(SHARED_LIBRARY) + endif + ifdef IMPORT_LIBRARY + MD_LIB_RELEASE_FILES += $(IMPORT_LIBRARY) + endif + ifdef PROGRAM + MD_BIN_RELEASE_FILES += $(PROGRAM) + endif + ifdef PROGRAMS + MD_BIN_RELEASE_FILES += $(PROGRAMS) + endif endif -ifdef PROGRAM - $(INSTALL) -m 555 $(PROGRAM) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR) + +release_md:: +ifneq ($(MD_LIB_RELEASE_FILES),) + $(INSTALL) -m 444 $(MD_LIB_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) endif -ifdef PROGRAMS - $(INSTALL) -m 555 $(PROGRAMS) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR) +ifneq ($(MD_BIN_RELEASE_FILES),) + $(INSTALL) -m 555 $(MD_BIN_RELEASE_FILES) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_BIN_DIR) endif +$(LOOP_OVER_DIRS) |