fedora-ds-make.patch

   1 diff -uNr fedora-ds-1.0.2.orig/httpd/autobuild fedora-ds-1.0.2/httpd/autobuild
   2 --- fedora-ds-1.0.2.orig/httpd/autobuild        2005-04-20 00:06:43.000000000 +0200
   3 +++ fedora-ds-1.0.2/httpd/autobuild     2006-04-18 02:41:52.000000000 +0200
   4 @@ -189,34 +189,34 @@
   5  buildserver() {
   6
   7  (cd ..; ./config $BOMB $PRODUCT $SECCONFIG $OPTIMIZE)
   8 -gmake
   9 +make
  10
  11  if [ $? -ne 0 ]; then
  12    exit 2
  13  fi
  14
  15 -(cd ../mc-icons; gmake)
  16 +(cd ../mc-icons; make)
  17  if [ $? -ne 0 ]; then
  18    exit 2
  19  fi
  20
  21 -(cd ../include; gmake)
  22 +(cd ../include; make)
  23  if [ $? -ne 0 ]; then
  24    exit 2
  25  fi
  26
  27 -(cd nsapi; gmake)
  28 +(cd nsapi; make)
  29  if [ $? -ne 0 ]; then
  30    exit 2
  31  fi
  32
  33 -(cd extras; gmake)
  34 +(cd extras; make)
  35  if [ $? -ne 0 ]; then
  36    exit 2
  37  fi
  38
  39  if [ "$NOJAVA" != "true" ]; then
  40 -  (cd ../lib/sjava; gmake)
  41 +  (cd ../lib/sjava; make)
  42    if [ $? -ne 0 ]; then
  43      exit 2
  44    fi
  45 @@ -406,7 +406,7 @@
  46
  47  # BONEHEAD
  48  (cd ..; ./config $BOMB admin $SECCONFIG $OPTIMIZE)
  49 -(cd ../admserv; gmake)
  50 +(cd ../admserv; make)
  51  if [ $? -ne 0 ]; then
  52    exit 2
  53  fi
  54 @@ -443,7 +443,7 @@
  55                         rm -f $NSPRDIR/*.o
  56                 fi
  57         fi
  58 -       (NS_USE_NATIVE=1; export NS_USE_NATIVE; cd ../batman; gmake MINIRDS_INSTALLDIR="../../httpd/$TARGETUNTAR/plugins" NSAPIDIR="$TARGETUNTAR/nsapi" minirds)
  59 +       (NS_USE_NATIVE=1; export NS_USE_NATIVE; cd ../batman; make MINIRDS_INSTALLDIR="../../httpd/$TARGETUNTAR/plugins" NSAPIDIR="$TARGETUNTAR/nsapi" minirds)
  60         if [ $? -ne 0 ]; then
  61                 exit 2
  62         fi
  63 diff -uNr fedora-ds-1.0.2.orig/ldap/clients/Makefile fedora-ds-1.0.2/ldap/clients/Makefile
  64 --- fedora-ds-1.0.2.orig/ldap/clients/Makefile  2005-04-20 00:07:01.000000000 +0200
  65 +++ fedora-ds-1.0.2/ldap/clients/Makefile       2006-04-18 02:41:06.000000000 +0200
  66 @@ -39,7 +39,7 @@
  67  # END COPYRIGHT BLOCK
  68  #
  69  #   Name:
  70 -#   Platform: gmake
  71 +#   Platform: make
  72  # --------------------------------------------------------------------------
  73  override BUILD_MODULE=HTTP_ADMIN
  74
  75 diff -uNr fedora-ds-1.0.2.orig/ldap/servers/snmp/ntagt/msrvdefs.mak fedora-ds-1.0.2/ldap/servers/snmp/ntagt/msrvdefs.mak
  76 --- fedora-ds-1.0.2.orig/ldap/servers/snmp/ntagt/msrvdefs.mak   2005-04-20 00:07:43.000000000 +0200
  77 +++ fedora-ds-1.0.2/ldap/servers/snmp/ntagt/msrvdefs.mak        2006-04-18 02:40:51.000000000 +0200
  78 @@ -87,7 +87,7 @@
  79  RM      =   rm -f
  80  AR      =   ar cr
  81  MD      =   mkdir -p
  82 -MAKE    =   gmake
  83 +MAKE    =   make
  84  STRIP   =   strip
  85  CP      =   cp
  86  ECHO    =   echo
  87 diff -uNr fedora-ds-1.0.2.orig/nsconfig.mk fedora-ds-1.0.2/nsconfig.mk
  88 --- fedora-ds-1.0.2.orig/nsconfig.mk    2006-02-15 23:53:45.000000000 +0100
  89 +++ fedora-ds-1.0.2/nsconfig.mk 2006-04-18 02:40:04.000000000 +0200
  90 @@ -53,7 +53,7 @@
  91
  92  ABS_ROOT := $(shell cd $(BUILD_ROOT); pwd)
  93  ABS_ROOT_PARENT := $(shell cd $(ABS_ROOT)/..; pwd)
  94 -MAKE=gmake $(BUILDOPT)
  95 +MAKE=make $(BUILDOPT)
  96
  97  # 7/12/96 Adrian - allow MAKEFLAGS to propagate
  98  # override MAKEFLAGS :=
  99 @@ -353,7 +353,7 @@
 100  NSCP_DIST      =  $(BUILD_ROOT)/../dist
 101  NSCP_DISTDIR          = $(BUILD_ROOT)/../dist/$(NSOBJDIR_NAME)
 102
 103 -MAKE=gmake $(BUILDOPT) NO_JAVA=1
 104 +MAKE=make $(BUILDOPT) NO_JAVA=1
 105
 106  export NSPR20=1
 107