more tweaks

Evaluator/Evaluator/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+
 pkginclude_HEADERS = \
 	Evaluator.h	\
 	defs.h

GenericFunctions/GenericFunctions/Makefile.am

 ## Process this file with automake to produce Makefile.in
  
+includedir = $(prefix)/include/CLHEP
+
 pkginclude_HEADERS = \
 	AbsFunctional.hh         \
 	AbsFunction.hh         \

Geometry/Geometry/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+
 pkginclude_HEADERS = \
 	BasicVector3D.h	\
 	Normal3D.h	\

HepMC/HepMC/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+
 pkginclude_HEADERS = \
 	CBhepevt.h	\
 	CBhepevt.icc	\

HepPDT/HepPDT/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
 
 pkginclude_HEADERS = \
 	CommonParticleData.hh	 \

Matrix/Matrix/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+
 pkginclude_HEADERS = \
 	DiagMatrix.h	\
 	DiagMatrix.icc	\

Random/Random/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+
 pkginclude_HEADERS = \
 	DRand48Engine.h	\
 	DualRand.h	\

RandomObjects/RandomObjects/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+
 pkginclude_HEADERS = \
 	RandMultiGauss.h	\
 	RandomVector.h		\

StdHep/StdHep/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+
 SUBDIRS = include 
 
 pkginclude_HEADERS = \

StdHep/StdHep/include/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+pkgincludedir = $(prefix)/include/CLHEP/@PACKAGE@
+
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)/include
 	$(INSTALL_DATA) $(srcdir)/herwig61.inc $(DESTDIR)$(pkgincludedir)/include/herwig61.inc

Units/Units/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+
 pkginclude_HEADERS = \
 	PhysicalConstants.h	\
 	SystemOfUnits.h		\

Utilities/Utilities/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
+
 pkginclude_HEADERS = \
 	fortran.h	\
 	defs.h

Vector/Vector/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
+includedir = $(prefix)/include/CLHEP
 
 pkginclude_HEADERS = \
 	AxisAngle.h		\