Update alpha templates as suggested by SL Baur and Adriaan Joubert.

Make similar changes to hpux templates.  Might want to do the same for
other foo_cc and foo_gcc pairs, but will desist until I hear from
someone who uses those platforms.

4 files changed, 7 insertions, 3 deletions

diff --git a/src/template/alpha_cc b/src/template/alpha_cc
index ec72ab063ff..be014190345 100644
--- a/src/template/alpha_cc
+++ b/src/template/alpha_cc
@@ -5,7 +5,9 @@ AROPT:crs
 # This is defined here because a bunch of clients include tmp/c.h,
 # which is where the work is done on HP-UX.  It only affects the
 # backend on Ultrix and OSF/1.
+CC:cc
 CFLAGS:-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000
+LDFLAGS='-rpath $(LIBDIR)'
 SHARED_LIB:
 ALL:
 SRCH_INC:
@@ -13,3 +15,5 @@ SRCH_LIB:
 DLSUFFIX:.so
 YFLAGS:-d
 YACC:
+CCC:cxx
+CXXFLAGS:-D__alpha__ -DNOFIXADE -O4 -Olimit 2000
diff --git a/src/template/alpha_gcc b/src/template/alpha_gcc
index 86a2509a9e4..95bc7d8fc85 100644
--- a/src/template/alpha_gcc
+++ b/src/template/alpha_gcc
@@ -5,12 +5,12 @@ AROPT:crs
 # This is defined here because a bunch of clients include tmp/c.h,
 # which is where the work is done on HP-UX.  It only affects the
 # backend on Ultrix and OSF/1.
+CC:gcc
 CFLAGS:-D__alpha__ -DNOFIXADE
 SHARED_LIB:
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.so
 YFLAGS:-d
 YACC:
diff --git a/src/template/hpux_cc b/src/template/hpux_cc
index 7b261b82465..8732e3d71c7 100644
--- a/src/template/hpux_cc
+++ b/src/template/hpux_cc
@@ -4,7 +4,6 @@ SHARED_LIB:+z
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DLSUFFIX:.sl
 YFLAGS:-d
 YACC:
diff --git a/src/template/hpux_gcc b/src/template/hpux_gcc
index 2f977be4801..365e5a020b3 100644
--- a/src/template/hpux_gcc
+++ b/src/template/hpux_gcc
@@ -4,8 +4,9 @@ SHARED_LIB:-fPIC
 ALL:
 SRCH_INC:
 SRCH_LIB:
-USE_LOCALE:no
 DL_LIB:/usr/lib/libdld.sl
 DLSUFFIX:.sl
 YFLAGS:-d
 YACC:
+CC:gcc
+CCC:g++