diff --git a/include/boost/regex.hpp b/include/boost/regex.hpp
index f3765087..8a050f2d 100644
--- a/include/boost/regex.hpp
+++ b/include/boost/regex.hpp
@@ -838,7 +838,7 @@ public:
    typedef Allocator                                                 alloc_type;
    typedef BOOST_RE_MAYBE_TYPENAME REBIND_TYPE(iterator, Allocator)  iterator_alloc;
    typedef typename iterator_alloc::size_type                        size_type;
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR_TRAITS)
+#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || !defined(BOOST_NO_STD_ITERATOR_TRAITS)
    typedef typename std::iterator_traits<iterator>::difference_type  difference_type;
    typedef typename std::iterator_traits<iterator>::value_type       char_type;
 #else
@@ -1512,5 +1512,6 @@ typedef match_results<const wchar_t*> wcmatch;
 
 
 
+
 
 
diff --git a/lib/generic.mak b/lib/generic.mak
new file mode 100644
index 00000000..4f5c4941
--- /dev/null
+++ b/lib/generic.mak
@@ -0,0 +1,88 @@
+#
+# auto generated makefile for generic compiler
+#
+# usage:
+# make
+#   brings libraries up to date
+# make clean
+#   deletes temporary object files (but not archives).
+#
+
+#
+# the following environment variables are recognised:
+# CXXFLAGS= extra compiler options - note applies to all build variants
+# INCLUDES= additional include directories
+# LDFLAGS=  additional linker options
+# LIBS=     additional library files
+# CXX=      compiler to use
+# LINKER=   linker/archiver to use
+# name of subdirectory to use for object/archive files:
+DIRNAME=generic
+
+#
+# default compiler options for release build:
+#
+C1=-c -O2 -I../../../
+
+
+
+ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp
+
+all : $(DIRNAME)  $(DIRNAME) $(DIRNAME)/boost_regex ./$(DIRNAME)/libboost_regex.a
+
+$(DIRNAME) :
+	mkdir -p $(DIRNAME)
+
+clean :  boost_regex_clean
+
+install : all
+
+
+
+########################################################
+#
+# section for libboost_regex.a
+#
+########################################################
+$(DIRNAME)/boost_regex/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
+
+$(DIRNAME)/boost_regex/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
+
+$(DIRNAME)/boost_regex/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
+
+$(DIRNAME)/boost_regex/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/cregex.o $(C1) $(CXXFLAGS) ../src/cregex.cpp
+
+$(DIRNAME)/boost_regex/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/fileiter.o $(C1) $(CXXFLAGS) ../src/fileiter.cpp
+
+$(DIRNAME)/boost_regex/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/posix_api.o $(C1) $(CXXFLAGS) ../src/posix_api.cpp
+
+$(DIRNAME)/boost_regex/regex.o: ../src/regex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex.o $(C1) $(CXXFLAGS) ../src/regex.cpp
+
+$(DIRNAME)/boost_regex/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
+
+$(DIRNAME)/boost_regex/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+
+$(DIRNAME)/boost_regex/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
+
+$(DIRNAME)/boost_regex/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
+
+$(DIRNAME)/boost_regex : 
+	mkdir -p $(DIRNAME)/boost_regex
+
+boost_regex_clean :
+	rm -f $(DIRNAME)/boost_regex/*.o
+
+./$(DIRNAME)/libboost_regex.so : $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_synch.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o
+	$(LINKER) $(LDFLAGS) -o $(DIRNAME)/libboost_regex.so  $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_synch.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(LIBS)
+
diff --git a/lib/sunpro.mak b/lib/sunpro.mak
deleted file mode 100644
index 75f451b6..00000000
--- a/lib/sunpro.mak
+++ /dev/null
@@ -1,76 +0,0 @@
-# Makefile for regex++ library
-#
-# for SUN workshop 5.0 C++ compiler
-#
-
-LIBNAME=regex++
-
-CPP=CC 
-CPP_FLAGS=-O -c
-
-AR=CC -O -xar -o
-AR_SO=CC -G -o
-
-INTDIR=.
-OUTDIR=.
-
-CPP_PROJ= $(CPP_FLAGS) -I../../../ $(CFGX)
-
-LIB32_OBJS= \
-	$(INTDIR)/posix_api.o \
-	$(INTDIR)/wide_posix_api.o \
-	$(INTDIR)/regex_synch.o \
-	$(INTDIR)/regex.o \
-	$(INTDIR)/fileiter.o \
-	$(INTDIR)/cregex.o \
-	$(INTDIR)/c_regex_traits_common.o \
-	$(INTDIR)/c_regex_traits.o
-	$(INTDIR)/cpp_regex_traits.o
-	$(INTDIR)/w32_regex_traits.o
-
-all: $(OUTDIR)/lib$(LIBNAME).a
-clean:
-	rm -f *.o
-	rm -rf SunWS_cache
-
-$(OUTDIR)/lib$(LIBNAME).a :: $(LIB32_OBJS)
-	$(AR) lib$(LIBNAME).a 	posix_api.o wide_posix_api.o re_strw.o regex_synch.o	regex.o fileiter.o cregex.o c_regex_traits.o c_regex_traits_common.o cpp_regex_traits.o
-
-$(INTDIR)/posix_api.o : ../src/posix_api.cpp
-	$(CPP) $(CPP_PROJ) ../src/posix_api.cpp
-
-$(INTDIR)/wide_posix_api.o : ../src/wide_posix_api.cpp
-	$(CPP) $(CPP_PROJ) ../src/wide_posix_api.cpp
-
-
-$(INTDIR)/re_strw.o : ../src/re_strw.cpp
-	$(CPP) $(CPP_PROJ) ../src/re_strw.cpp
-
-
-$(INTDIR)/regex_synch.o : ../src/regex_synch.cpp
-	$(CPP) $(CPP_PROJ) ../src/regex_synch.cpp
-
-
-$(INTDIR)/regex.o : ../src/regex.cpp
-	$(CPP) $(CPP_PROJ) ../src/regex.cpp
-
-$(INTDIR)/fileiter.o : ../src/fileiter.cpp
-	$(CPP) $(CPP_PROJ) ../src/fileiter.cpp
-
-$(INTDIR)/cregex.o : ../src/cregex.cpp
-	$(CPP) $(CPP_PROJ) ../src/cregex.cpp
-
-$(INTDIR)/c_regex_traits.o : ../src/c_regex_traits.cpp
-	$(CPP) $(CPP_PROJ) ../src/c_regex_traits.cpp
-
-$(INTDIR)/c_regex_traits_common.o : ../src/c_regex_traits_common.cpp
-	$(CPP) $(CPP_PROJ) ../src/c_regex_traits_common.cpp
-
-$(INTDIR)/cpp_regex_traits.o : ../src/cpp_regex_traits.cpp
-	$(CPP) $(CPP_PROJ) ../src/cpp_regex_traits.cpp
-
-
-
-
-
-