--- a/Make.proto	Tue May 07 13:58:08 2013 +0200
+++ b/Make.proto	Tue May 07 13:58:26 2013 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.144 2013-05-07 09:47:51 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.145 2013-05-07 11:58:26 cg Exp $
 #
 # DO NOT EDIT
 # automagically generated from the projectDefinition: stx_libview2.
@@ -34,7 +34,7 @@
 # add the path(es) here:,
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libview -I$(INCLUDE_TOP)/stx/libbasic
+LOCALINCLUDES= -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libbasic2 -I$(INCLUDE_TOP)/stx/libview
 
 
 # if you need any additional defines for embedded C code,
@@ -95,8 +95,10 @@
 	fi
 
 $(LIBJPEG_DIR)/libjpeg.a: $(LIBJPEG_MAKE_LIB)
-	cp $(LIBJPEG_MAKE_LIB) $(LIBJPEG)
+	cp $(LIBJPEG_MAKE_LIB)/.libs/libjpeg.a $(LIBJPEG)
 
+#the following is needed for linux; LIBJPEG_MAKE_LIB is expanded to: $(LIBJPEG_DIR)/.libs/libjpeg.a
+#do not replace taget below by LIBJPEG_MAKE_LIB, because it may be empty for other systems (osx)
 $(LIBJPEG_DIR)/.libs/libjpeg.a: $(LIBJPEG_DIR)/Makefile $(LIBJPEG_DIR)/*.c $(LIBJPEG_DIR)/*.h
 	@-echo
 	@-echo "making libjpeg support library ..."