[Fedora-directory-commits] setuputil nsconfig.mk, 1.4, 1.5 nsdefs.mk, 1.4, 1.5

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14258

Modified Files:
	nsconfig.mk nsdefs.mk 
Log Message:
[175900] SetupUtil build (IPF)
Ported onto HP-UX IPF (B.11.23)



Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsconfig.mk	19 Jan 2006 23:10:03 -0000	1.4
+++ nsconfig.mk	28 Jan 2006 02:33:14 -0000	1.5
@@ -82,9 +82,13 @@
     ifeq ($(NSOS_TEST1),i86pc)
       NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
       NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
+    endif
+    ifeq ($(NSOS_ARCH),HP-UX)
+        NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
+        NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
     else
-      NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)
-      NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
+        NSCONFIG         = $(NSOS_ARCH)$(NSOS_RELEASE)
+        NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
     endif
     ifeq ($(NSOS_ARCH),WINNT)
       ifeq ($(DEBUG), fulld)


Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nsdefs.mk	9 Nov 2005 01:56:12 -0000	1.4
+++ nsdefs.mk	28 Jan 2006 02:33:14 -0000	1.5
@@ -61,21 +61,24 @@
   BUILD_PTHREADS=
 endif
 
-ifeq ($(USE_64), 1)
-  NS64TAG = _64
-else
-  ifeq ($(BUILD_ARCH), HPUX)
-    ifeq ($(NSOS_TEST1),ia64)
-      NS64TAG=_32
-    endif
-  endif
-endif
-
 PRETTY_ARCH := $(shell uname -s)
  
 NSOS_ARCH  := $(subst /,_,$(shell uname -s))
 NSOS_TEST1 := $(shell uname -m)
 
+ifeq ($(USE_64), 1)
+  NS64TAG:=_64
+endif
+
+ifeq ($(BUILD_ARCH), HPUX)
+  ifeq ($(NSOS_TEST1),ia64)
+    ARCHTYPE=_ia64
+    ifneq ($(USE_64), 1)
+      NS64TAG:=_32
+    endif
+  endif
+endif
+
 ifeq ($(TMP_ARCH), SunOS)
   ifeq ($(NSOS_TEST1), i86pc)
 	ARCHTYPE= _i86pc