--- c++/config/commence.in.orig	Mon Jun 30 16:19:35 2003
+++ c++/config/commence.in	Mon Oct 20 23:44:08 2003
@@ -27,7 +27,7 @@
 RM=rm -f
 CP=cp
 INSTALL=@INSTALL@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@
+INSTALL_PROGRAM=@INSTALL_SCRIPT@
 INSTALL_DATA=@INSTALL_DATA@
 TRACE=:
 
@@ -37,7 +37,7 @@
 bindir=@bindir@
 libdir=@libdir@
 includedir=@includedir@
-docdir=@exec_prefix@/doc
+docdir=@exec_prefix@/share
 PUB_LIB=$(LIB)
 
 ## Obtain default library; the current version of libtool does not fully
@@ -60,8 +60,8 @@
 ## Optional variables. We must declare them here because Irix pmake
 ## complains if it sees a reference to a variable which has never been
 ## defined. The main makefile is free to redefine these to something else.
-DOCDIR=$(docdir)
-EXAMPLEDIR=$(docdir)/hdf5/examples/c++
+DOCDIR=$(docdir)/doc/hdf5
+EXAMPLEDIR=$(docdir)/examples/hdf5/c++
 LIB=
 LIB_SRC=
 LIB_OBJ=