[Fedora-directory-commits] setuputil nsconfig.mk, 1.1.1.1, 1.2 nsdefs.mk, 1.3, 1.4

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	nsconfig.mk nsdefs.mk 
Log Message:
setuputil was using something wacky (we really ought to have standardized make/shell code that generates the same objdir name across all components/platforms, but I suppose this won't be a problem after we convert to automake for everything).

Before: Linux2.6.13_i686_glibc_PTH_OPT.OBJ

After: Linux2.6_x86_glibc_PTH_OPT.OBJ

Same as the other components.



Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsconfig.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- nsconfig.mk	29 Jul 2005 22:16:18 -0000	1.1.1.1
+++ nsconfig.mk	9 Nov 2005 01:56:12 -0000	1.2
@@ -44,7 +44,9 @@
 
 ifeq ($(NSOS_ARCH),Linux)
   ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-    NSOS_TEST1    = x86
+    NSOS_TMP    := x86
+  else
+	NSOS_TMP    := $(NSOS_TEST1)
   endif
   ifeq ($(USE_LIBC),1)
     LIBC_VERSION  = _libc
@@ -52,7 +54,7 @@
     LIBC_VERSION  = _glibc
   endif
   PTHREAD_TAG   = _PTH
-  NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(LIBC_VERSION)$(PTHREAD_TAG)
+  NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TMP)$(LIBC_VERSION)$(PTHREAD_TAG)
   NSCONFIG_NOTAG  = $(NSCONFIG)
   NSOBJDIR_NAME     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
 else


Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nsdefs.mk	26 Oct 2005 16:38:09 -0000	1.3
+++ nsdefs.mk	9 Nov 2005 01:56:12 -0000	1.4
@@ -170,6 +170,13 @@
       NSOS_RELEASE = 4
       # Always use gcc on RHEL
       GCC_VERSION = gcc$(word 1, $(shell gcc --version | sed 's/gcc.*GCC.\s//' | sed 's/\..*//'))
+    else
+# generic Linux
+      NSOS_ARCH := Linux
+# just keep major.minor release version e.g.
+# 2.6.13-1.1532_FC4 -> 2.6
+# also 10.11.4444 -> 10.11
+	  NSOS_RELEASE := $(shell echo $(NSOS_RELEASE) | sed 's/\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
     endif
   endif
 endif