[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.39,1.40

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile 
Log Message:
Bug(s) fixed: 172056
Bug Description: Fix internal component versions and formats for initial 
FDS 1.0 build
Reviewed by: Noriko (Thanks!)
Fix Description: Some of the naming conventions needed to change e.g. 
/s/b/c/ldapconsole10ext became /fedora/components/directoryconsole/1.0.  
Made the ds onlinehelp docs available to build externally.  Perldap has 
no zip file anymore, just the dirs we copy over.  Adminserver includes 
the unzipped directories - we need to fix that eventually, but in the 
meantime, I made tar skip those unzipped directories.  I also merged 
Noriko's fix for the assecure.txt problem in setup into Fedora DS.  Noriko also pointed out an unused Makefile variable.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile	29 Oct 2005 02:21:51 -0000	1.39
+++ Makefile	31 Oct 2005 15:55:29 -0000	1.40
@@ -70,6 +70,8 @@
 
 MMDD = $(shell date +%m.%d)
 
+TMPLIST := $(shell echo /tmp/build.$$$$)
+
 # we don't want to build with warnings-as-errors for the cm/ stuff, because
 # it's crappy C++ code which is LITTERED with warnings, most of which we
 # can't fix because it comes from files in dist/, etc.
@@ -483,16 +485,24 @@
 # docs
 	-$(RM) -r $(RELDIR)/manual/en/slapd
 	-$(MKDIR) $(RELDIR)/manual/en/slapd
-	if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
+# copy over the manual files built in our build tree
+	if [ -d "$(OBJDIR)/manual/slapd" ] ; then \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/help/*.* $(RELDIR)/manual/en/slapd/help ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.map $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.htm $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/pixel.gif $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/topicindex.htm $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/tokens.map $(RELDIR)/manual/en/slapd/ ; \
+    fi
+# copy the manual files from the zip files or checked out directory
+	if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
 	  cd $(RELDIR)/manual/en/slapd; \
-	  $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
-	  $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
+      if [ -f $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) ] ; then \
+	    $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
+	    $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
+      else \
+        cp -r $(DSDOC_DIR) . ; \
+      fi ; \
 	fi
 
 ifdef USE_PURIFY
@@ -651,7 +661,6 @@
 		for file in $(ADMINSERVER_SUBCOMPS) ; \
 			do rm -rf $(INSTDIR)/$$file ; \
 			cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
-			rm -rf $(INSTDIR)/$$file/unzipped ; \
 		done ; \
 	fi
 
@@ -685,8 +694,11 @@
 #	$(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
 endif
 else
+	echo base/unzipped > $(TMPLIST)
+	echo admin/unzipped >> $(TMPLIST)
 	cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd  \
-	dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+	dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+	rm -f $(TMPLIST)
 endif # BUILD_SHIP
 #cp $(INSTDIR).tar.gz  $(BUILD_SHIP)
 #cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz  $(BUILD_SHIP)