--- trunk/OOPSE-2.0/make/Makefile.in	2005/04/11 16:14:05	2157
+++ trunk/OOPSE-2.0/make/Makefile.in	2005/04/13 22:30:22	2190
@@ -51,14 +51,16 @@ PackageLibs = \
 	minimizers \
 	selection \
 	restraints \
+	lattice \
 
 #packages containing applications
 Applications = \
 	applications/oopse \
 	applications/dump2Xyz \
-        applications/simpleBuilder\
 	applications/staticProps \
 	applications/dynamicProps \
+        applications/simpleBuilder\
+	applications/nanoRodBuilder \
 
 Samples = \
 	samples/argon \
@@ -75,14 +77,17 @@ IncludeDirs = \
 	samples/zcons \
 
 IncludeDirs = \
-	@MPI_INC_DIR@
+	@CGAL_INC_DIR@ \
+	@MPI_INC_DIR@ 
 
 LibraryDirs = \
+	@CGAL_LIB_DIR@ \
 	@MPI_LIB_DIR@ 
 
 Libraries = \
+	@CGAL_LIBS@ \
 	@MPI_LIB@ \
-	@MPI_F90_LIB@
+	@MPI_F90_LIB@ 
 
 OopseHome       = @OOPSE_HOME@
 ForceParamDir   = $(OopseHome)/share/forceFields
@@ -235,12 +240,21 @@ tr = $(eval __t := $3)                                
 [0-9] := 0 1 2 3 4 5 6 7 8 9 #
 [A-F] := A B C D E F #
 
-# Upper case and lower case functions.  Each function has a single
-# argument which is the text to alter
+# Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
+# if we do not then we need to use the shell version of tr, and not the
+# faster tr function above:
 
-uc = $(call tr,$([a-z]),$([A-Z]),$1)
-lc = $(call tr,$([A-Z]),$([a-z]),$1)
+__have_eval := $(false)
+__ignore := $(eval __have_eval := $(true))
 
+ifndef __have_eval
+  uc = $(shell echo $1 | tr "a-z" "A-Z")
+  lc = $(shell echo $1 | tr "A-Z" "a-z")
+else
+  uc = $(call tr,$([a-z]),$([A-Z]),$1)
+  lc = $(call tr,$([A-Z]),$([a-z]),$1)
+endif
+
 # OK, now we can actually use these functions to figure out the names
 # of the module files: