[Fedora-directory-commits] adminserver/base Makefile,1.16,1.17

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/adminserver/base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16896/adminserver/base

Modified Files:
    Makefile 
Log Message:
It's a little bit tricky.  The base package is a dependency of both the main admin server package and the directory server package.  However, it works if you just create a zero length .zip file for the base archive - you get a warning when running setup, but everything installs correctly.  While it's not perfect (it will be addressed for the next major release) it will at least allow those developers who do not want to use java at all to build and install.

You must use "make NOJAVA=1 ..." to build and package admin server without java.

Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/base/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Makefile	18 Nov 2005 21:16:39 -0000	1.16
+++ Makefile	18 Jan 2006 18:24:25 -0000	1.17
@@ -149,13 +149,14 @@
    cd $(PKGTOP); $(TAR) cvfX $(RELTOP)/base.tar $(RELTOP)/base.ex base
    -rm $(RELTOP)/base.tar.gz $(RELTOP)/base.ex
    cd $(RELTOP); gzip -f base.tar
-endif     
+endif

pkguxClient:

rm -rf $(CLIENT_DIR)
    rm -f $(BASEDIR)/ns$(BASE_CLIENT).zip

+ifndef NOJAVA
    -$(MKDIR) $(CLIENT_DIR)/$(JAVA_DIR)
    -$(MKDIR) $(CONSOLE_HELP)
    -$(CHMOD) 0777 $(CLIENT_DIR)/$(JAVA_DIR)
@@ -211,6 +212,11 @@
    cd $(CLIENT_DIR) ; \
       $(IZIP) $(BASEDIR)/ns$(BASE_CLIENT).zip * ;

+else # NOJAVA
+	-$(MKDIR) $(BASEDIR)
+	touch $(BASEDIR)/ns$(BASE_CLIENT).zip
+endif # NOJAVA
+
 ifeq ($(ARCH), Linux)
    $(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf
 else