--- rpl/tools/Attic/Makefile.in	2010/04/17 18:57:45	1.12
+++ rpl/tools/Attic/Makefile.in	2010/08/22 16:38:46	1.30
@@ -53,6 +53,7 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BROKEN_SIGINFO = @BROKEN_SIGINFO@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -62,6 +63,7 @@ CXX = @CXX@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+C_STANDARD = @C_STANDARD@
 DATE = @DATE@
 DATE_FR = @DATE_FR@
 DEBUG = @DEBUG@
@@ -75,6 +77,7 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@
 EXPORT_DYNAMIC = @EXPORT_DYNAMIC@
+EXT_SQL = @EXT_SQL@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
@@ -97,14 +100,16 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPCS_SYSV = @IPCS_SYSV@
+IPV6 = @IPV6@
 LATEX = @LATEX@
 LDFLAGS = @LDFLAGS@
-LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MALLOC = @MALLOC@
 MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
@@ -129,6 +134,8 @@ READLINE = @READLINE@
 RUNPATH = @RUNPATH@
 SED = @SED@
 SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
+SEMAPHORES_SYSV = @SEMAPHORES_SYSV@
+SEMUN = @SEMUN@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
@@ -211,7 +218,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \
 		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
-		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz
+		@FILE@.diff.gz @SQLITE@.tar.gz @SQLITE@.diff.gz @OPENSSL@.tar.gz
 
 all: all-am
 
@@ -386,14 +393,33 @@ uninstall-am:
 
 all:
 	TMP=$$(mktemp tmp.XXXXXXXXXX); \
-	sed s/DREADLINE/UREADLINE/g @UNITS@/Makefile > $$TMP; \
-	\mv -f $$TMP @UNITS@/Makefile
+	sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \
+			sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \
+	mv -f $$TMP @UNITS@/Makefile
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Making $@ in $$subdir"; \
-		$(MAKE) -C $$subdir $@ ; \
+		if [ $$subdir = @OPENSSL@ ]; then \
+			if [ @OS@ = "OS2" ]; then \
+				$(MAKE) -C $$subdir -j1 -f OS2-EMX.mak2; \
+			else \
+				$(MAKE) -C $$subdir -j1 $@; \
+			fi; \
+		else \
+			if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
+				TMP=$$(mktemp tmp.XXXXXXXXXX); \
+				sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
+						@UNITS@/Makefile > $$TMP; \
+				mv -f $$TMP @UNITS@/Makefile; \
+			fi; \
+			$(MAKE) -C $$subdir $@; \
+		fi; \
 	done;
 	if [ ! -f @OPENSSL@/tests_success ]; then \
-		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+		if [ @OS@ = "OS2" ]; then \
+			(cd @OPENSSL@ && touch tests_success); \
+		else \
+			(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+		fi; \
 	fi
 	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 			$(top_builddir)/tools/@FILE@/src/*.o \
@@ -403,13 +429,13 @@ all:
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		if [ $$subdir = @OPENSSL@ ]; then \
-			$(MAKE) -C $$subdir -j1 $@; \
-		else \
+		if [ ! $$subdir = @OPENSSL@ ]; then \
 			$(MAKE) -C $$subdir $@; \
-		fi;
+		fi; \
 	done;
-	\rm @OPENSSL@/tests_success
+	if [ -f @OPENSSL@/tests_success ]; then \
+		rm -f @OPENSSL@/tests_success; \
+	fi
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -427,10 +453,10 @@ install: all
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
 	$(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \
-			$(DESTDIR)$(bindir)/rplfile$(EXEEXT);
+			$(DESTDIR)$(bindir)/rplfile$(EXEEXT)
 
 uninstall:
-	\rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \
+	rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \
 			$(DESTDIR)$(datadir)/rplunits \
 			$(DESTDIR)$(bindir)/rplpp$(EXEEXT) \
 			$(DESTDIR)$(mandir)/man1/gpp.1 \