[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.43,1.44

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3853

Modified Files:
	Makefile 
Log Message:
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


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile	11 Nov 2005 14:34:01 -0000	1.43
+++ Makefile	16 Nov 2005 03:53:06 -0000	1.44
@@ -238,7 +238,9 @@
 # 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
 
 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)