improve the header copy

Vector/Makefile.am

@@ -12,45 +12,48 @@ bin_SCRIPTS = Vector-config
 all-local: $(top_builddir)/CLHEP
 
 # create temporary CLHEP header tree
+# we only copy headers for packages listed in @PACKAGE@-deps
 # search for header directories in the following order:
-#	1.  $(top_srcdir)/..
-#	2.  $(CLHEPSOURCE_DIR)/CLHEP
-#	3.  $(CLHEP_DIR)/CLHEP
+#	1.  $(top_builddir)/this-package
+#	2.  $(top_builddir)/../other-packages
+#	3.  $(CLHEPSOURCE_DIR)/CLHEP
+#	4.  $(CLHEP_DIR)/include/CLHEP
 #
 # abs_ => absolute path
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 COPY_P = @COPY_P@
 
-$(top_builddir)/CLHEP:
-	mkdir $(top_builddir)/CLHEP;
-	cd $(abs_top_builddir); list=`ls $(abs_top_srcdir)/..`;  \
+$(top_builddir)/CLHEP:  temp-package-dirs
+	list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
 	for pkg in $$list; do \
-	  if test -d $(abs_top_srcdir)/../"$$pkg"/"$$pkg"; then \
-	    (cd $(abs_top_builddir)/CLHEP; mkdir $$pkg; cd $$pkg; \
-	    hdrs=`ls $(abs_top_srcdir)/../$$pkg/$$pkg`; \
-	    for hdr in $$hdrs; do $(COPY_P) $(abs_top_srcdir)/../$$pkg/$$pkg/$$hdr $$hdr; done; \
-	    if test -f $(abs_top_builddir)/../"$$pkg"/"$$pkg"/defs.h; then $(COPY_P) $(abs_top_builddir)/../$$pkg/$$pkg/defs.h defs.h; fi; \
-	    if test -f $(abs_top_builddir)/"$$pkg"/defs.h && test ! -e defs.h ; then $(COPY_P) $(abs_top_builddir)/$$pkg/defs.h defs.h; fi); \
-	  fi; done
-	cd $(abs_top_builddir);  \
-	if test -n "$(CLHEPSOURCE_DIR)" && test -d $(CLHEPSOURCE_DIR)/CLHEP; then \
-	  (list=`ls $(CLHEPSOURCE_DIR)/CLHEP`;  \
-	  for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
-	    if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
-	      (mkdir $$pkg; cd $$pkg; \
-	      hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
-	      for hdr in $$hdrs; do $(COPY_P) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
-	    fi; done); fi
-	cd $(abs_top_builddir);  \
-	if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/CLHEP; then \
-	  (list=`ls $(CLHEP_DIR)/CLHEP`;  \
-	  for pkg in $$list; do cd $(abs_top_builddir)/CLHEP; \
-	    if test -d $(CLHEP_DIR)/CLHEP/"$$pkg"/"$$pkg" && test ! -d "$$pkg"; then \
-	      (mkdir $$pkg; cd $$pkg; \
-	      hdrs=`ls $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg`; \
-	      for hdr in $$hdrs; do $(COPY_P) $(CLHEP_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $$hdr; done); \
-	    fi; done); fi
+	  if test -d "$$pkg" ; then \
+	    (cd $$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
+	  else \
+	    if test -d ../"$$pkg"/"$$pkg" ; then \
+	      (cd ../$$pkg/$$pkg && $(MAKE) $(AM_MAKEFLAGS) TEMPDIR=$(abs_top_builddir) install-tmpHEADERS) || exit 1 ; \
+	    else \
+	      if test -d $(CLHEPSOURCE_DIR)/CLHEP/"$$pkg"/"$$pkg"; then \
+	        hdrs=`ls $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg`; \
+	        for hdr in $$hdrs; do $(COPY_P) $(CLHEPSOURCE_DIR)/CLHEP/$$pkg/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
+	      else \
+		if test -n "$(CLHEP_DIR)" && test -d $(CLHEP_DIR)/include/CLHEP; then \
+		    if test -d $(CLHEP_DIR)/include/CLHEP/"$$pkg"; then \
+		      hdrs=`ls $(CLHEP_DIR)/include/CLHEP/$$pkg`; \
+		      for hdr in $$hdrs; do $(COPY_P) $(CLHEP_DIR)/include/CLHEP/$$pkg/$$hdr $(abs_top_builddir)/CLHEP/$$pkg/$$hdr; done; \
+		    fi; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  fi; \
+	done;
+
+temp-package-dirs:
+	$(mkinstalldirs) $(abs_top_builddir)/CLHEP;
+	list="`cat @PACKAGE@-deps | sed s/CLHEP-@PACKAGE@-@VERSION@// | sed s/CLHEP-// | sed s/-@VERSION@//`"; \
+	for pkg in $$list; do \
+	  $(mkinstalldirs) $(abs_top_builddir)/CLHEP/$$pkg; \
+	done;
 
 docs:
 	cd doc; $(MAKE) $(AM_MAKEFLAGS)

Vector/Vector-config.in

@@ -8,7 +8,7 @@ includedir=@includedir@
 
 usage()
 {
-    cat >2 <<EOF
+    cat  <<EOF
 Usage: Vector-config [OPTION]
 
 Known values for OPTION are:
@@ -60,7 +60,10 @@ while test $# -gt 0; do
 	;;
 
     --cxx)
-       	echo @CXX@
+       	echo "CXX:    " @CXX@
+       	echo "CC:     " @CC@
+       	echo "CPP:    " @CPP@
+       	echo "CXXCPP: " @CXXCPP@
        	;;
 
     --cppflags)

Vector/Vector-deps.in

 CLHEP-@PACKAGE@-@VERSION@ CLHEP-@PACKAGE@-@VERSION@ 
+CLHEP-@PACKAGE@-@VERSION@ CLHEP-Units-@VERSION@

Vector/Vector/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
 includedir = $(prefix)/include/CLHEP
+tempincludedir = $(TEMPDIR)/CLHEP/@PACKAGE@
+COPY_P = @COPY_P@
 
 pkginclude_HEADERS = \
 	AxisAngle.h		\
@@ -39,3 +41,16 @@ pkginclude_HEADERS = \
 
 # Identify generated file(s) to be removed when 'make clean' is requested:
 CLEANFILES = defs.h
+
+# copy headers into $(tempincludedir)
+install-tmpHEADERS:
+	@echo " install headers in $(TEMPDIR)/CLHEP "
+	@list='$(pkginclude_HEADERS)'; \
+	if test $(TEMPDIR); then \
+	  for p in $$list; do \
+	    if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+	    echo " $(COPY_P) $$d$$p $(tempincludedir)/$$f"; \
+	    $(COPY_P) $$d$$p $(tempincludedir)/$$f; \
+	  done; \
+	fi; test -z "$$fail"

Vector/configure.in

@@ -15,9 +15,8 @@ AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/AxisAngle.cc])
 AM_INIT_AUTOMAKE(1.6 foreign)
 AC_PROG_LIBTOOL
-AC_PROG_LN_S
 AC_PROG_INSTALL
-
+AC_PROG_LN_S
 
 # ----------------------------------------------------------------------
 # Identify the files that 'configure' is to produce:
@@ -107,6 +106,7 @@ AH_BOTTOM([#endif  // VECTOR_DEFS_H])
 # Account for any user configuration options:
 # ----------------------------------------------------------------------
 
+
 # ----------------------------------------------------------------------
 # Check for needed programs:
 # ----------------------------------------------------------------------