[Fedora-directory-commits] dsbuild/meta/ds .cvsignore, NONE, 1.1 Makefile, 1.10, 1.11

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsbuild/meta/ds
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10545/meta/ds

Modified Files:
	Makefile 
Added Files:
	.cvsignore 
Log Message:
updated for Fedora DS 1.1


--- NEW FILE .cvsignore ---
work
download
cookies


Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/meta/ds/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	6 Nov 2006 22:43:22 -0000	1.10
+++ Makefile	8 Feb 2008 21:52:03 -0000	1.11
@@ -1,5 +1,5 @@
 GARNAME = ds
-GARVERSION = 1.0.4
+GARVERSION = 1.1.0
 CATEGORIES = meta
 
 # assume that if someone defines DEBUG=1 they mean DEBUG=full
@@ -12,33 +12,71 @@
   export USE_64=1
 endif
 
-LIBDEPS = ds/mozilla ds/icu ds/adminutil ds/setuputil ds/mod_nss ds/mod_admserv ds/mod_restartd
+ifndef PREFIX
+  export PREFIX=/opt/dirsrv
+endif
 
-ifndef NOJAVA
-LIBDEPS += ds/console ds/admservconsole
+# depending on the platform, a component may already be provided
+# LIBDEPS controls which ones are built from source
+LIBDEPS =
+
+ifdef NSPR_SOURCE
+LIBDEPS += ds/nspr
 endif
 
-LIBDEPS += ds/onlinehelp ds/adminserver
+ifdef NSS_SOURCE
+LIBDEPS += ds/nss
+endif
 
-ifndef NOJAVA
-LIBDEPS += ds/directoryconsole
+ifdef SVRCORE_SOURCE
+LIBDEPS += ds/svrcore
 endif
 
 ifdef SASL_SOURCE
 LIBDEPS += ds/cyrus-sasl
 endif
+
+ifdef MOZLDAP_SOURCE
+LIBDEPS += ds/mozldap
+endif
+
+ifdef PERLDAP_SOURCE
+LIBDEPS += ds/perldap
+endif
+
+ifdef DB_SOURCE
 LIBDEPS += ds/db
+endif
+
+ifdef ICU_SOURCE
+LIBDEPS += ds/icu
+endif
+
 ifdef SNMP_SOURCE
 LIBDEPS += ds/net-snmp
 endif
 
-ifndef NOJAVA
-LIBDEPS += ds/ldapjdk ds/crimson ds/dsmlgwjars
+LIBDEPS += ds/ldapserver
+
+ifdef BUILD_DS_ADMIN
+ifdef ADMINUTIL_SOURCE
+LIBDEPS += ds/adminutil
+endif
+
+ifdef MOD_NSS_SOURCE
+LIBDEPS += ds/mod_nss
 endif
 
-LIBDEPS += ds/dsonlinehelp ds/ldapserver
+ifdef ADMINSERVER_SOURCE
+LIBDEPS += ds/adminserver
+endif
+endif
+
+ifndef NOJAVA
+LIBDEPS += ds/ldapjdk ds/jss ds/console ds/fedora-idm-console ds/admservconsole ds/directoryconsole
+endif
 
-DESCRIPTION = ds
+DESCRIPTION = Directory Server
 
 include ../../gar.mk
 
@@ -53,6 +91,8 @@
 
 help:
 	@echo Usage: make [BUILD_RPM=1] [NOJAVA=1] [DEBUG=1] [USE_64=1] [SASL_SOURCE=1]
+	@echo "    PREFIX=/path  - install files to use this directory as the runtime prefix - default /opt/dirsrv"
+	@echo "    DESTDIR=/path - build prefix - no default"
 	@echo "    BUILD_RPM=1   - create an installable RPM (tarball otherwise)"
 	@echo "    NOJAVA=1      - skip all Java related code (console, etc.)"
 	@echo "    DEBUG=1       - build debugable code (default is optimized)"