diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | component_versions.mk | 12 | ||||
| -rw-r--r-- | components.mk | 5 | ||||
| -rw-r--r-- | config/HP-UXB.11.23.mk | 43 | ||||
| -rw-r--r-- | internal_buildpaths.mk | 7 | ||||
| -rw-r--r-- | internal_comp_deps.mk | 20 | ||||
| -rw-r--r-- | ldap/cm/Makefile | 20 | ||||
| -rw-r--r-- | ldap/cm/genPerlDAPInf.pl | 78 | ||||
| -rw-r--r-- | ldap/cm/newinst/ux-dialog.cc | 15 | ||||
| -rw-r--r-- | ldap/javarules.mk | 62 | ||||
| -rw-r--r-- | ldap/servers/slapd/Makefile | 16 | ||||
| -rw-r--r-- | nsconfig.mk | 8 | ||||
| -rwxr-xr-x | nsperl.mk | 2 |
13 files changed, 213 insertions, 81 deletions
@@ -199,17 +199,17 @@ httpdLib: brandDirectory: $(RELTOOLSPATH)/brandver.pl @echo ==== Branding LDAP Server ========== - $(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec + $(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/rhds/brandver.dat -s redhat-ds.spec @echo ==== Finished Branding LDAP Server ========== versionDirectory: $(RELTOOLSPATH)/brandver.pl @echo ==== Debranding LDAP Server ========== - $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec + $(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat -s fedora-ds.spec @echo ==== Finished Debranding LDAP Server ========== normalizeDirectory: $(RELTOOLSPATH)/brandver.pl @echo ==== Normalizing LDAP Server ========== - $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec + $(PERL) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/normalize.dat -s redhat-ds.spec @echo ==== Normalizing Branding LDAP Server ========== buildAndPkgDirectory: buildDirectory pkgDirectory diff --git a/component_versions.mk b/component_versions.mk index 42ff4ba7..dd6790b9 100644 --- a/component_versions.mk +++ b/component_versions.mk @@ -63,10 +63,10 @@ endif # LIBDB DBDEFS:= ifndef DB_MAJOR_MINOR -DB_MAJOR_MINOR:=db42 +DB_MAJOR_MINOR:=db-4.2 endif ifndef DB_VERSION - DB_VERSION:=20040813 + DB_VERSION:=20060308 endif # SMARTHEAP @@ -109,7 +109,7 @@ endif # admin server ifndef ADM_RELDATE - ADM_RELDATE = 20060328 + ADM_RELDATE = 20060405 endif ifndef ADM_VERSDIR ADM_VERSDIR = adminserver/1.0 @@ -122,7 +122,7 @@ endif # setuputil ifndef SETUPUTIL_RELDATE - SETUPUTIL_RELDATE = 20060327 + SETUPUTIL_RELDATE = 20060405 endif ifndef SETUPUTIL_VER SETUPUTIL_VER = 10 @@ -166,7 +166,7 @@ ifndef LDAPCONSOLE_RELDATE endif ifndef PERLDAP_VERSION - PERLDAP_VERSION=1.5/20051028 + PERLDAP_VERSION=1.5/20060331 endif ifndef JSS_COMP @@ -185,7 +185,7 @@ ifndef SASL_VERSDIR SASL_VERSDIR=cyrus endif ifndef SASL_RELDATE - SASL_RELDATE=v2.1.20 + SASL_RELDATE=v2.1.20.1 endif # jakarta/axis for DSMLGW diff --git a/components.mk b/components.mk index bcdd1850..9a4297a7 100644 --- a/components.mk +++ b/components.mk @@ -194,7 +194,8 @@ endif SECURITY_INCLUDE = -I$(SECURITY_INCDIR) # add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign -SECURITY_LIBNAMES = ssl3 nss3 softokn3 +# as of NSS 3.11, no longer need to link with softokn3 +SECURITY_LIBNAMES = ssl3 nss3 # these libs have a corresponding .chk file SECURITY_NEED_CHK = softokn3 @@ -359,7 +360,7 @@ else SASL_INCDIR = $(SASL_SOURCE_ROOT)/include/sasl else SASL_LIBPATH = $(SASL_BUILD_DIR)/lib - SASL_INCDIR = $(SASL_BUILD_DIR)/include + SASL_INCDIR = $(SASL_BUILD_DIR)/include/sasl endif endif SASL_INCLUDE = $(SASL_INCDIR) diff --git a/config/HP-UXB.11.23.mk b/config/HP-UXB.11.23.mk new file mode 100644 index 00000000..bce4c61a --- /dev/null +++ b/config/HP-UXB.11.23.mk @@ -0,0 +1,43 @@ +# +# BEGIN COPYRIGHT BLOCK +# This Program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. +# Copyright (C) 2006 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# +# +# Config stuff for HP-UX.11.23 +# +include $(DEPTH)/config/HP-UX.mk diff --git a/internal_buildpaths.mk b/internal_buildpaths.mk index ce7e505d..2e2239f7 100644 --- a/internal_buildpaths.mk +++ b/internal_buildpaths.mk @@ -118,11 +118,10 @@ endif # ICU_SOURCE_ROOT #DB_SOURCE_ROOT = $(BUILD_ROOT)/../db-4.2.52.NC # DB_MAJOR_MINOR is the root name for the db shared library -# source builds use db-4.2 - uncomment this if using source -#DB_MAJOR_MINOR := db-4.2 +DB_MAJOR_MINOR := db-4.2 ifndef DB_SOURCE_ROOT -DB_MAJOR_MINOR := db42 -db_component_name=$(DB_MAJOR_MINOR) +# db_component_name is the dir name in /s/b/c +db_component_name=db42 db_path_config :=$(NSCP_DISTDIR)/$(db_component_name) endif # DB_SOURCE_ROOT diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk index face9aae..3d6f9ad3 100644 --- a/internal_comp_deps.mk +++ b/internal_comp_deps.mk @@ -176,7 +176,7 @@ endif # LDAPSDK_SOURCE_ROOT ifndef SASL_SOURCE_ROOT ifneq ($(ARCH), Linux) -SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME) +SASL_RELEASE = $(COMPONENTS_DIR_DEV)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME) SASL_DEP = $(SASL_INCLUDE)/sasl.h ifndef SASL_PULL_METHOD SASL_PULL_METHOD = $(COMPONENT_PULL_METHOD) @@ -216,10 +216,11 @@ endif # ICU_SOURCE_ROOT ifndef DB_SOURCE_ROOT #if no version specified, we'll use the latest one ifndef DB_VERSION - DB_VERSION=20040130 + DB_VERSION=20060308 endif # define the paths to the component parts -db_components_share=$(COMPONENTS_DIR)/$(db_component_name) +#db_components_share=$(COMPONENTS_DIR)/$(db_component_name) +db_components_share=$(COMPONENTS_DIR_DEV)/$(db_component_name) MY_NSOBJDIR_TAG=$(NSOBJDIR_TAG).OBJ db_release_config =$(db_components_share)/$(DB_VERSION)/$(NSCONFIG_NOTAG)$(MY_NSOBJDIR_TAG) # add ",bin" to DB_FILES if you want the programs like db_verify, db_recover, etc. @@ -508,7 +509,18 @@ endif #PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) ifeq ($(BUILD_MODE), int) -PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) + PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) + ifeq ($(BUILD_ARCH), RHEL4) + # use 64-bit perl on 64-bit RHEL4; 32-bit on 32-bit RHEL4 + PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME) + endif + ifeq ($(BUILD_ARCH), HPUX) + HPUX_ARCH := $(shell uname -m) + ifeq ($(HPUX_ARCH), ia64) + # use 64-bit perl on 64-bit IPF HP-UX + PERLDAP_COMPONENT_DIR = $(COMPONENTS_DIR_DEV)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME) + endif + endif else PERLDAP_COMPONENT_DIR = $(FED_COMPONENTS_DIR)/perldap/$(PERLDAP_VERSION)/$(NSOBJDIR_NAME_32) endif diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index 837ff8fd..aa24b2f4 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -195,7 +195,7 @@ ADMIN_SERVER_TARGZ=$(ADMINSERVER_PKG) ADMIN_IMPORTS_TARGZ=$(ADMIN_SERVER_TARGZ) ifeq ($(USE_SETUPUTIL), 1) - LDAP_PACKAGE_FILES:=setup setup.inf setup.res slient.inf unzip_wrapper.pl dsktune LICENSE.txt README.txt slapd + LDAP_PACKAGE_FILES:=setup setup.inf setup.res silent.inf unzip_wrapper.pl svrcore dsktune LICENSE.txt README.txt slapd else LDAP_PACKAGE_FILES:=setup dsktune slapd endif @@ -626,12 +626,24 @@ packageDirectory: $(INSTDIR)/slapd \ # this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others ifeq ($(USE_SETUPUTIL), 1) cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR) + @echo "removing unzipped dir" + @dirs=`ls $(INSTDIR)`; for adir in $$dirs ; do \ + if [ -d $(INSTDIR)/$$adir/unzipped ] ; then \ + rm -rf $(INSTDIR)/$$adir/unzipped; \ + fi; \ + done ifeq ($(DS_BRAND), redhat) - cd $(INSTDIR); \ - $(RELTOOLSPATH)/brandver.pl -i $(ABS_ROOT)/branding/rhds/setup.dat; \ + @(cd $(INSTDIR); \ + $(PERL) $(RELTOOLSPATH)/brandver.pl -i $(ABS_ROOT)/branding/rhds/setup.dat; \ cat setup.inf | sed -e "s/^#Resource/Resource/" > setup.inf.tmp; \ - mv setup.inf.tmp setup.inf + mv setup.inf.tmp setup.inf) +endif endif + +ifeq ($(USE_PERLDAP), 1) + mkdir $(INSTDIR)/perldap + cp -R $(PERLDAP_BUILT_DIR)/* $(INSTDIR)/perldap + $(PERL) genPerlDAPInf.pl $(INSTDIR)/perldap/perldap.inf 1.5 "Fedora Project" endif # copy in our product .inf files diff --git a/ldap/cm/genPerlDAPInf.pl b/ldap/cm/genPerlDAPInf.pl new file mode 100644 index 00000000..79932f8c --- /dev/null +++ b/ldap/cm/genPerlDAPInf.pl @@ -0,0 +1,78 @@ +# +# BEGIN COPYRIGHT BLOCK +# This Program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; version 2 of the License. +# +# This Program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA. +# +# In addition, as a special exception, Red Hat, Inc. gives You the additional +# right to link the code of this Program with code not covered under the GNU +# General Public License ("Non-GPL Code") and to distribute linked combinations +# including the two, subject to the limitations in this paragraph. Non-GPL Code +# permitted under this exception must only link to the code of this Program +# through those well defined interfaces identified in the file named EXCEPTION +# found in the source code files (the "Approved Interfaces"). The files of +# Non-GPL Code may instantiate templates or use macros or inline functions from +# the Approved Interfaces without causing the resulting work to be covered by +# the GNU General Public License. Only Red Hat, Inc. may make changes or +# additions to the list of Approved Interfaces. You must obey the GNU General +# Public License in all respects for all of the Program code and other code used +# in conjunction with the Program except the Non-GPL Code covered by this +# exception. If you modify this file, you may extend this exception to your +# version of the file, but you are not obligated to do so. If you do not wish to +# provide this exception without modification, you must delete this exception +# statement from your version and license this file solely under the GPL without +# exception. +# +# +# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission. +# Copyright (C) 2006 Red Hat, Inc. +# All rights reserved. +# END COPYRIGHT BLOCK +# + +# Usage: genPerlDAPInf.pl <full_path_to_perldap.inf> <version> <Vendor> + +$vendor = "Red Hat, Inc."; +if ($#ARGV < 1) { + print "Usage: genPerlDAPInf.pl <full_path_to_perldap.inf> <version> [<Vendora>]\n"; + exit 1; +} +$outfile = $ARGV[0]; +$version = $ARGV[1]; +if ($#ARGV >= 2) { + $vendor = $ARGV[2]; +} + +print "outfile: $outfile, version: $version, vendor: $vendor\n"; + +($nodot_version = $version) =~ tr/\.//d; +$component = "perldap" . $nodot_version; + +open(OUT, ">$outfile") or die "Error: could not write file $outfile: $!"; +print OUT "[General]\n"; +print OUT "Name=PerLDAP\n"; +print OUT "Description=This is mozilla.org PerLDAP.\n"; +print OUT "Components=$component\n\n"; +print OUT "[$component]\n"; +print OUT "Description=The mozilla.org PerLDAP $version\n"; +print OUT "NickName=$component\n"; +print OUT "Name=PerLDAP $version\n"; +print OUT "SourcePath=perldap\n"; +print OUT "Vendor=$vendor\n"; +print OUT "Security=none\n"; +print OUT "Version=$version\n"; +print OUT "Compatible=$version\n"; +print OUT "Archive=perldap-$version.zip\n"; +print OUT "Visible=FALSE\n"; +print OUT "Checked=TRUE\n"; +close OUT; + +exit 0; diff --git a/ldap/cm/newinst/ux-dialog.cc b/ldap/cm/newinst/ux-dialog.cc index 0b7023f8..4f4c010d 100644 --- a/ldap/cm/newinst/ux-dialog.cc +++ b/ldap/cm/newinst/ux-dialog.cc @@ -49,17 +49,20 @@ ** *********************************************************************/ -#include <errno.h> -#include <iostream.h> -#include <fstream.h> -/* Newer g++ wants the new std header forms */ -#if defined( Linux ) +#if !defined(HPUX) || defined(_HP_NAMESPACE_STD) +#include <iostream> #include <strstream> +#include <fstream> +using namespace std; using std::ostrstream; -/* But some platforms won't accept those (specifically HP-UX aCC */ #else +/* older HP-UX compiler, using libstd 1 (no -AA) */ +#include <iostream.h> /* use old name on older systems */ #include <strstream.h> +#include <fstream.h> #endif + +#include <errno.h> #include <stdio.h> #include <unistd.h> #include <ctype.h> diff --git a/ldap/javarules.mk b/ldap/javarules.mk index baa70c29..7250acff 100644 --- a/ldap/javarules.mk +++ b/ldap/javarules.mk @@ -68,54 +68,34 @@ endif PATH_SEP := : ifeq ($(OS), Windows_NT) - GET_JAVA_FROM_PATH := 1 - PATH_SEP := ; - EXE_SUFFIX := .exe + GET_JAVA_FROM_PATH := 1 + PATH_SEP := ; + EXE_SUFFIX := .exe endif -# For NT, assume a locally installed JDK -ifdef GET_JAVA_FROM_PATH +ifeq ($(INTERNAL_BUILD), 1) + # For UNIX, use JDK and JAR files over NFS + ifeq ($(ARCH), Linux) + JDK_VERSION:=1.4.2_SR3 + JDK_VERSDIR:=ibmjdk/$(JDK_VERSION)/$(NSOBJDIR_NAME) + else + ifeq ($(ARCH), HPUX) + JDK_VERSION:=1.4.2_09 + JDK_VERSDIR:=hpjdk/$(JDK_VERSION) + else + JDK_VERSION:=1.4.2_10 # Solaris + JDK_VERSDIR:=jdk/$(JDK_VERSION)/$(NSOBJDIR_NAME) + endif + endif + JDKLIB:=$(COMPONENTS_DIR)/$(JDK_VERSDIR)/lib/tools.jar + JAVABINDIR:=$(COMPONENTS_DIR)/$(JDK_VERSDIR)/bin +else # INTERNAL_BUILD # Figure out where the java lib .jar files are, from where javac is JDKCOMP := $(shell which javac) JDKPRELIB := $(subst bin/javac$(EXE_SUFFIX),lib,$(JDKCOMP)) JDKLIB := $(addprefix $(JDKPRELIB)/,tools.jar) -else - -# For UNIX, use JDK and JAR files over NFS -# Use NT classes.zip; doesn't matter that it was compiled on NT -# -# Version 1.4.0_01 of the JDK does not seem to run well on RHEL 3.0 - ifeq ($(ARCH), Linux) - JDK_VERSION=1.4.2 - else - ifeq ($(ARCH), HPUX) - JDK_VERSION=1.4.1_05 - else - JDK_VERSION=1.4.0_01 - endif - endif +endif - JDK_VERSDIR=jdk$(JDK_VERSION) - JDKLIB=/share/builds/components/jdk/$(JDK_VERSION)/$(PRETTY_ARCH)/lib/tools.jar - ifeq ($(NSOS_ARCH), IRIX) -# Get IRIX compiler from tools directory, currently 1.1.3 - JAVABINDIR=/tools/ns/bin - else - ifeq ($(ARCH), AIX) -# Get AIX compiler from tools directory, currently 1.1.2 - JAVABINDIR=/tools/ns/bin - else - ifeq ($(ARCH), OSF1) - JAVABINDIR=/share/builds/components/jdk/1.1.6beta/OSF1/bin - else -# Solaris, Linux, HP/UX and any others: - JDK_DIR=$(COMPONENTS_DIR)/jdk - JAVABINDIR=$(JDK_DIR)/$(JDK_VERSION)/$(PRETTY_ARCH)/bin - endif - endif - endif -endif - CLASSPATH := $(JAVA_SRC_DIR)$(PATH_SEP)$(LDAPJARFILE) ifndef JAVA diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile index ceb4ac29..71e1788a 100644 --- a/ldap/servers/slapd/Makefile +++ b/ldap/servers/slapd/Makefile @@ -91,12 +91,12 @@ endif endif ifeq ($(ARCH), HPUX) -ifeq ($(OS_TEST),ia64) -LDAP_DONT_USE_SMARTHEAP=1 -ifeq ($(DEBUG), optimize) -CFLAGS+=+O3 -endif -endif + ifeq ($(NSOS_TEST1),ia64) + LDAP_DONT_USE_SMARTHEAP=1 + ifeq ($(DEBUG), optimize) + CFLAGS+=+O3 + endif + endif endif # Don't use smartheap for debug builds @@ -200,12 +200,12 @@ ifeq ($(ARCH), HPUX) ifeq ($(DEBUG), full) ifeq ($(USE_64), 1) EXTRA_LIBS_TEMP:=$(EXTRA_LIBS) - ifneq ($(OS_TEST), ia64) + ifneq ($(NSOS_TEST1), ia64) EXTRA_LIBS += /opt/langtools/lib/pa20_64/end.o endif else EXTRA_LIBS_TEMP:=$(EXTRA_LIBS) - ifneq ($(OS_TEST), ia64) + ifneq ($(NSOS_TEST1), ia64) EXTRA_LIBS += /opt/langtools/lib/end.o endif endif #USE_64 diff --git a/nsconfig.mk b/nsconfig.mk index d2490272..46654bf8 100644 --- a/nsconfig.mk +++ b/nsconfig.mk @@ -67,6 +67,7 @@ ifdef INTERNAL_BUILD USE_DSGW:=1 USE_JAVATOOLS:=1 USE_SETUPUTIL:=1 + USE_PERLDAP:=1 else USE_ADMINSERVER:=1 USE_CONSOLE:=1 @@ -75,6 +76,7 @@ else USE_DSGW:=1 USE_JAVATOOLS:=1 USE_SETUPUTIL:=1 + USE_PERLDAP:=1 GET_JAVA_FROM_PATH := 1 GET_ANT_FROM_PATH := 1 USE_PERL_FROM_PATH := 1 @@ -532,13 +534,15 @@ endif CC=cc -Ae -D_POSIX_C_SOURCE=199506L ifeq ($(BUILD_MODULE), HTTP_ADMIN) ifeq ($(NSOS_RELEASE),B.11.23) -CXX=aCC -AP -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext +# -AA -- new-lib libstd 2 +CXX=aCC -AA -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext else CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext endif else ifeq ($(NSOS_RELEASE),B.11.23) -CXX=aCC -AP -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext +# -AA -- new-lib libstd 2 +CXX=aCC -AA -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext else CXX=aCC -DHPUX_ACC -D__STDC_EXT__ -D_POSIX_C_SOURCE=199506L -ext endif @@ -41,7 +41,7 @@ NSPERL_RELDATE := 20020626 # default; will be redefined below for specific platform #PERL=$(NSPERL_COMPONENT_DIR)/lib/$(NSPERL_VERSION)/nsperl -PERL=/share/builds/sbstools/nsPerl/$(NSPERL_RELDATE)/$(NSOBJDIR_NAME_32)/nsperl +PERL=perl ifeq ($(BUILD_ARCH), WINNT) PERL=nsperl endif |