[Fedora-directory-commits] ldapserver/ldap Makefile,1.9,1.10

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile 
Log Message:
Bug(s) fixed: 167453
Bug Description: Use all open source components
Reviewed by: Noriko (Thanks!)
Fix Description: This changes the DS 72 build to pick up the new Admin 
Server open source candidate (using Apache, modules, etc), and the new 
adminutil and setuputil components.  The code has been changed to 
reflect the new naming (adminsdk -> adminutil, setupsdk -> setuputil) 
and new versions of these components (7.1) and new /s/b/c disk layout 
where applicable.  We don't really get very much from the admin server 
anymore, just the admin and base packages.  All of the other setup stuff 
(setup, setup.inf, svrcore, etc.) come directly from the setuputil package.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	9 May 2005 22:11:21 -0000	1.9
+++ Makefile	2 Sep 2005 20:40:47 -0000	1.10
@@ -61,7 +61,7 @@
 ifneq ($(ARCH), WINNT) 
 	cd systools; $(MAKE) $(MFLAGS) all
 	# new unix installer
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
 	cd cm/newinst; $(MAKE) $(MFLAGS) all
 ifeq ($(USE_64),1)
 	# In 64-bit builds, we build the installer 32-bit, which has the side-effect that the uninstaller and ns-update scripts
@@ -70,11 +70,11 @@
 	$(CP) $(RELDIR_32)/bin/slapd/admin/bin/ns-update $(LDAP_ADMIN_BIN_RELDIR)
 	$(CP) $(RELDIR_32)/bin/slapd/admin/bin/uninstall $(LDAP_ADMIN_BIN_RELDIR)
 endif # USE_64
-endif # USE_SETUPSDK
+endif # USE_SETUPUTIL
 else # not WINNT
-ifeq ($(USE_SETUPSDK), 1)
+ifeq ($(USE_SETUPUTIL), 1)
 	cd cm/newinstnt; $(MAKE) $(MFLAGS) all
-endif # USE_SETUPSDK
+endif # USE_SETUPUTIL
 endif # WINNT
 	cd admin; $(MAKE) $(MFLAGS) all
 ifeq ($(ARCH), WINNT)