diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-11-16 03:53:06 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-11-16 03:53:06 +0000 |
| commit | b5a2d4f417e1edfdc375b98c6eea8c4bc3f763ae (patch) | |
| tree | 1abc8d2465e2929972c36bf96eff1799f3867317 | |
| parent | 892bd96b33e73ec1b265de95d43399919692d3ab (diff) | |
add jar files back to the main package - even though the gpl and apl are not generally compatible, they are compatible for this specific case
| -rw-r--r-- | ldap/cm/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index 3e38736f..f784622d 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -238,7 +238,9 @@ DS_JAR_SRC_PATH = $(NSDIST)/$(BUILD_DEBUG) # web services files that are Apache or Java licensed - we cannot put them # in the same rpm/tarball as the directory server, so we create a separate # package for them, using the below macro as the staging area -EXT_JAVA_RELDIR = $(BUILD_ROOT)/built/release/extjava +#EXT_JAVA_RELDIR = $(BUILD_ROOT)/built/release/extjava +# actually, we can - GPL is compatible with APL in this situation +EXT_JAVA_RELDIR = $(RELDIR) DS_JAR_DEST_PATH = java/jars XMLTOOLS_JAR_FILE = xmltools.jar @@ -629,7 +631,7 @@ endif endif ifeq ($(USE_DSMLGW), 1) - cd $(EXT_JAVA_RELDIR) ; tar cf - * | gzip > $(ABS_INSTDIR)/extjava.tar.gz +# cd $(EXT_JAVA_RELDIR) ; tar cf - * | gzip > $(ABS_INSTDIR)/extjava.tar.gz endif ifeq ($(USE_CONSOLE),1) |