diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2005-03-21 19:44:33 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2005-03-21 19:44:33 +0000 |
| commit | 5016e79084c3bb9fc7d3ca6cd415648174dffafb (patch) | |
| tree | 7a1a2123aa1bdf79fd9a347de1f5fc32421f820b | |
| parent | 414c704a52802a9fef005ef077a14dba29f37fa8 (diff) | |
| download | ds-5016e79084c3bb9fc7d3ca6cd415648174dffafb.tar.gz ds-5016e79084c3bb9fc7d3ca6cd415648174dffafb.tar.xz ds-5016e79084c3bb9fc7d3ca6cd415648174dffafb.zip | |
Differentiate between internal and external components during branding
| -rw-r--r-- | component_versions.mk | 2 | ||||
| -rw-r--r-- | internal_comp_deps.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/component_versions.mk b/component_versions.mk index b4cb4582..cdc59fcb 100644 --- a/component_versions.mk +++ b/component_versions.mk @@ -150,7 +150,7 @@ ifndef LDAPCONSOLE_COMP LDAPCONSOLE_COMP = ldapconsole$(LDAPCONSOLE_REL) endif ifndef LDAPCONSOLE_RELDATE - LDAPCONSOLE_RELDATE=20050314 + LDAPCONSOLE_RELDATE=20050321 endif ifndef PERLDAP_VERSION diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index edef4e97..39b4a365 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -11,6 +11,8 @@ # We should consider using wget or something like that # in the future. +BUILD_MODE = ext + ifndef NSPR_SOURCE_ROOT NSPR_IMPORT = $(COMPONENTS_DIR)/nspr20/$(NSPR_RELDATE)/$(FULL_RTL_OBJDIR) NSPR_DEP = $(NSPR_LIBPATH)/libnspr4.$(LIB_SUFFIX) @@ -564,7 +566,7 @@ LDAPCONSOLEJAR = ds$(LDAPCONSOLE_REL).jar LDAPCONSOLEJAR_EN = ds$(LDAPCONSOLE_REL)_en.jar LDAPCONSOLE_RELEASE=$(COMPONENTS_DIR_DEV) -LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/$(LDAPCONSOLE_COMP)ext/$(LDAPCONSOLE_RELDATE)/jars +LDAPCONSOLE_JARDIR = $(LDAPCONSOLE_RELEASE)/$(LDAPCONSOLE_COMP)$(BUILD_MODE)/$(LDAPCONSOLE_RELDATE)/jars LDAPCONSOLE_DEP = $(CLASS_DEST)/$(LDAPCONSOLEJAR) LDAPCONSOLE_FILES=$(LDAPCONSOLEJAR),$(LDAPCONSOLEJAR_EN) |