The former build assumed either no separate objdirs, or objdir links to a

separate equivalent hierarchy.  There are two cases where this does not hold:
1. When the objdirs are real directories in the src tree, i.e. not links.
2. When OBJMACHINE is set.
Fix these remaining cases.

4 files changed, 76 insertions, 54 deletions

diff --git a/gnu/lib/libg++/libg++/Makefile.bsd-wrapper b/gnu/lib/libg++/libg++/Makefile.bsd-wrapper
index 6e356a4943d..00a78d99ed8 100644
--- a/gnu/lib/libg++/libg++/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libg++/Makefile.bsd-wrapper
@@ -1,4 +1,26 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.2 1996/03/26 00:27:38 niklas Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.3 1996/05/19 21:48:28 niklas Exp $
+
+.if defined(OBJMACHINE)
+OBJDIR=	obj.${MACHINE}
+.else
+OBJDIR=	obj
+.endif
+
+RX_DIR=		$(.CURDIR)/../librx
+
+RX_OBJDIR!=	if [ -d $(RX_DIR)/$(OBJDIR) ]; then \
+			echo $(RX_DIR)/$(OBJDIR); \
+		else \
+			echo $(RX_DIR); \
+		fi
+
+LIBIO_DIR=	$(.CURDIR)/../libio
+
+LIBIO_OBJDIR!=	if [ -d $(LIBIO_DIR)/$(OBJDIR) ]; then \
+			echo $(LIBIO_DIR)/$(OBJDIR); \
+		else \
+			echo $(LIBIO_DIR); \
+		fi
 
 VERSION = 2.7.1
 LIBG++_DIST_VERSION = 2.7.1
@@ -10,7 +32,7 @@ SUBDIR+=	gperf genclass
 LIB=		g++
 CXXFLAGS+=	-fno-implicit-templates
 CPPFLAGS+=	-I. -I$(.CURDIR)/src -I$(.CURDIR)/../libio \
-		-I$(.CURDIR)/../libstdc++ -I../libio
+		-I$(.CURDIR)/../libstdc++ -I$(LIBIO_OBJDIR)
 LDADD+=		-lcurses
 
 CXXSRCS=	AllocRing.cc Obstack.cc builtin.cc $(REGEX_OBJ) Regex.cc \
@@ -28,30 +50,8 @@ CSRCS=		bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c \
 COBJS=		$(CSRCS:N*.h:R:S/$/.o/g)
 GXXOBJS=	$(CXXOBJS) $(COBJS)
 
-.if defined(OBJMACHINE)
-OBJDIR=	obj.${MACHINE}
-.else
-OBJDIR=	obj
-.endif
-
-RX_DIR=		$(.CURDIR)/../librx
-
-RX_OBJDIR!=	if [ -d $(RX_DIR)/$(OBJDIR) ]; then \
-			echo $(RX_DIR)/$(OBJDIR); \
-		else \
-			echo $(RX_DIR); \
-		fi
-
 RXOBJ=		$(RX_OBJDIR)/rx.o
 
-LIBIO_DIR=	$(.CURDIR)/../libio
-
-LIBIO_OBJDIR!=	if [ -d $(LIBIO_DIR)/$(OBJDIR) ]; then \
-			echo $(LIBIO_DIR)/$(OBJDIR); \
-		else \
-			echo $(LIBIO_DIR); \
-		fi
-
 G_CFG_H=	$(LIBIO_OBJDIR)/_G_config.h
 
 SRCS=		$(CXXSRCS) $(CSRCS)
@@ -95,4 +95,4 @@ afterinstall:
 	done
 
 
-.include <bsd.lib.mk>
\ No newline at end of file
+.include <bsd.lib.mk>
diff --git a/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper b/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
index 6fdc5cc1cac..6c06aa45c93 100644
--- a/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
@@ -1,15 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.3 1996/03/27 23:00:01 niklas Exp $
-
-.PATH:		$(.CURDIR)/src
-
-PROG=		gperf
-CC=		g++
-CPPFLAGS+=	-nostdinc++ -I$(.CURDIR)/src -I$(.CURDIR)/../../libio  \
-		-I$(.CURDIR)/../../libstdc++ -I$(.CURDIR)/../src \
-		-I../../libio
-SRCS=		new.cc options.cc iterator.cc main.cc gen-perf.cc \
-		key-list.cc list-node.cc hash-table.cc bool-array.cc \
-		read-line.cc std-err.cc version.cc
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.4 1996/05/19 21:48:30 niklas Exp $
 
 .if defined(OBJMACHINE)
 OBJDIR=	obj.${MACHINE}
@@ -17,6 +6,14 @@ OBJDIR=	obj.${MACHINE}
 OBJDIR=	obj
 .endif
 
+LIBIO_DIR=	$(.CURDIR)/../../libio
+
+LIBIO_OBJDIR!=	if [ -d $(LIBIO_DIR)/$(OBJDIR) ]; then \
+			echo $(LIBIO_DIR)/$(OBJDIR); \
+		else \
+			echo $(LIBIO_DIR); \
+		fi
+
 STD_DIR=	$(.CURDIR)/../../libstdc++
 
 STD_OBJDIR!=	if [ -d $(STD_DIR)/$(OBJDIR) ]; then \
@@ -33,6 +30,17 @@ GXX_OBJDIR!=	if [ -d $(GXX_DIR)/$(OBJDIR) ]; then \
 			echo $(GXX_DIR); \
 		fi
 
+.PATH:		$(.CURDIR)/src
+
+PROG=		gperf
+CC=		g++
+CPPFLAGS+=	-nostdinc++ -I$(.CURDIR)/src -I$(.CURDIR)/../../libio  \
+		-I$(.CURDIR)/../../libstdc++ -I$(.CURDIR)/../src \
+		-I$(LIBIO_OBJDIR)
+SRCS=		new.cc options.cc iterator.cc main.cc gen-perf.cc \
+		key-list.cc list-node.cc hash-table.cc bool-array.cc \
+		read-line.cc std-err.cc version.cc
+
 LDFLAGS+=	-L$(STD_OBJDIR) -L$(GXX_OBJDIR)
 
 # if DESTDIR is set, then -nostdlib will be fed to g++, which will prevent
diff --git a/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper b/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper
index fe7683af593..658d9af07b7 100644
--- a/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libstdc++/Makefile.bsd-wrapper
@@ -1,18 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.5 1996/05/13 11:32:48 niklas Exp $
-
-LIB=		stdc++
-CXXFLAGS+=	-fno-implicit-templates -nostdinc++
-CPPFLAGS+=	-I$(.CURDIR) -I$(.CURDIR)/../libio -I../libio
-LDADD+=		-lm
-
-SUBDIR+=	stl
-
-# stdc++ sources/objs
-STD_SRCS=	newi.cc cstringi.cc stddefi.cc stdexcepti.cc typeinfoi.cc \
-		exceptioni.cc cstdlibi.cc cmathi.cc 
-SPEC_OBJS=	cstrmain.o cstrio.o fcomplex.o fcomio.o dcomplex.o dcomio.o \
-		ldcomplex.o ldcomio.o
-STD_OBJS=	$(STD_SRCS:N*.h:R:S/$/.o/g) $(SPEC_OBJS)
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.6 1996/05/19 21:48:31 niklas Exp $
 
 IO_DIR=		$(.CURDIR)/../libio
 LIBIBERTY_DIR=	$(.CURDIR)/../libiberty
@@ -37,6 +23,20 @@ LIBIBERTY_OBJDIR!=if [ -d $(LIBIBERTY_DIR)/$(OBJDIR) ]; then \
 			echo $(LIBIBERTY_DIR); \
 		fi
 
+LIB=		stdc++
+CXXFLAGS+=	-fno-implicit-templates -nostdinc++
+CPPFLAGS+=	-I$(.CURDIR) -I$(.CURDIR)/../libio -I$(IO_OBJDIR)
+LDADD+=		-lm
+
+SUBDIR+=	stl
+
+# stdc++ sources/objs
+STD_SRCS=	newi.cc cstringi.cc stddefi.cc stdexcepti.cc typeinfoi.cc \
+		exceptioni.cc cstdlibi.cc cmathi.cc 
+SPEC_OBJS=	cstrmain.o cstrio.o fcomplex.o fcomio.o dcomplex.o dcomio.o \
+		ldcomplex.o ldcomio.o
+STD_OBJS=	$(STD_SRCS:N*.h:R:S/$/.o/g) $(SPEC_OBJS)
+
 # As we need to fill variables with contents of dynamically created files
 # we must first see to that they are really generated.  This is a hack that
 # ensures this.  The echo at the end is because make doesn't like command
diff --git a/gnu/lib/libg++/libstdc++/stl/Makefile.bsd-wrapper b/gnu/lib/libg++/libstdc++/stl/Makefile.bsd-wrapper
index 8111b81ea7c..5f16cc9d2c3 100644
--- a/gnu/lib/libg++/libstdc++/stl/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libstdc++/stl/Makefile.bsd-wrapper
@@ -1,9 +1,23 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.1 1996/03/16 05:18:57 etheisen Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.2 1996/05/19 21:48:32 niklas Exp $
+
+IO_DIR=		$(.CURDIR)/../../libio
+
+.if defined(OBJMACHINE)
+OBJDIR=	obj.${MACHINE}
+.else
+OBJDIR=	obj
+.endif
+
+IO_OBJDIR!=	if [ -d $(IO_DIR)/$(OBJDIR) ]; then \
+			echo $(IO_DIR)/$(OBJDIR); \
+		else \
+			echo $(IO_DIR); \
+		fi
 
 LIB=	stl
 CXXFLAGS+=	-fno-implicit-templates -nostdinc++
 CPPFLAGS+=	-I$(.CURDIR) -I$(.CURDIR)/.. -I$(.CURDIR)/../../libio \
-		-I$(.OBJDIR)/../../libio
+		-I$(IO_OBJDIR)
 
 CLEANFILES+=	stl.list