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

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	Makefile 
Log Message:
[179394] HP-UX IPF support (adminserver)
0) support HP-UX 11.23 ia64
1) adjusted to the components' path name change (suffix, version number)
2) added [admin] section to setup.inf (in pkgadmin.mk)
3) fixed type mismatch for the cert version
4) adjusted the admin jar names
5) created symlinks libxxx.so for libxxx.so.## (e.g., libicui18n.so for libicui18n.so.34)
6) added "admin" to the component list: "Components = ..." in setup.inf



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/base/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile	18 Jan 2006 18:24:25 -0000	1.17
+++ Makefile	1 Feb 2006 23:04:57 -0000	1.18
@@ -131,10 +131,14 @@
 	cd $(CORE_DIR) ; \
 	   $(IZIP) $(COREDIR)/ns$(CORE_MAIN).zip * ;
 
-ifeq ($(ARCH), Linux)
+ifdef INTERNAL_BUILD
+  ifeq ($(ARCH), Linux)
 	$(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf
-else
+  else
 	$(COMPONENTS_DIR)/perl5/$(ARCH)-perl5/perl fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf
+  endif
+else
+	$(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) svrcore.inf $(COREDIR)/svrcore.inf
 endif
 
 pkgSBC:
@@ -195,7 +199,11 @@
 # Copy JSS lib
 	-$(MKDIR) $(CLIENT_DIR)/lib
 ifeq ($(ARCH), HPUX)
+    ifeq ($(HPUX_ARCH), ia64)
+	cp -p $(JSSSDK_PATH)/libjss3.so  $(CLIENT_DIR)/lib
+    else
 	cp -p $(JSSSDK_PATH)/libjss3.sl  $(CLIENT_DIR)/lib
+    endif
 else
 	cp -p $(JSSSDK_PATH)/libjss3.so  $(CLIENT_DIR)/lib
 endif
@@ -217,8 +225,12 @@
 	touch $(BASEDIR)/ns$(BASE_CLIENT).zip
 endif # NOJAVA
 
-ifeq ($(ARCH), Linux)
+ifdef INTERNAL_BUILD
+  ifeq ($(ARCH), Linux)
 	$(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf
-else
+  else
 	$(COMPONENTS_DIR)/perl5/$(ARCH)-perl5/perl fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf
+  endif
+else
+	$(PERL) fixPI.pl SETUP_BASE ../include/version.h ../$(NSPLATFORM_DIR)/buildnum.dat $(BUILD_SECURITY) base.inf $(BASEDIR)/base.inf
 endif