summaryrefslogtreecommitdiff
path: root/gnu/lib/libg++
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>1996-03-11 04:58:22 +0000
committerthorpej <thorpej@NetBSD.org>1996-03-11 04:58:22 +0000
commite311fddd2af345fbd7e56f039374c8830c1d4a7a (patch)
tree230d1b2f9e7cef546282dfeb6ce670a5c6007068 /gnu/lib/libg++
parente142a2195fdbb49e7023ecfe0dd3a9b8916e0336 (diff)
Fix installation of header files.
Diffstat (limited to 'gnu/lib/libg++')
-rw-r--r--gnu/lib/libg++/Makefile26
-rw-r--r--gnu/lib/libg++/libg++2netbsd26
2 files changed, 22 insertions, 30 deletions
diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile
index f4162e39b17..3fb6e7597ee 100644
--- a/gnu/lib/libg++/Makefile
+++ b/gnu/lib/libg++/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.12 1996/03/09 00:19:02 phil Exp $
+# $NetBSD: Makefile,v 1.13 1996/03/11 04:58:22 thorpej Exp $
SUBDIR= libg++ libstdc++ # libio libiostream
-INCLUDEDIRS= include libg++/src
-
beforeinstall:
install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}/usr/include/g++
@@ -13,14 +11,12 @@ beforeinstall:
${DESTDIR}/usr/include/g++/std
install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}/usr/include/g++/stl
- @-for i in ${INCLUDEDIRS}; do \
- echo installing includes from $$i ; \
- (cd $$i; for j in *.[ih]; do \
- cmp -s $$j ${DESTDIR}/usr/include/g++/$$j || \
- install -c -o ${BINOWN} -g ${BINGRP} -m 644 $$j \
- ${DESTDIR}/usr/include/g++/$$j; \
- done); \
- done
+ @echo installing includes from libg++/src
+ @(cd libg++/src ; for j in *.[ih]; do \
+ cmp -s $$j ${DESTDIR}/usr/include/g++/$$j || \
+ install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
+ ${DESTDIR}/usr/include/g++/$$j; \
+ done)
@echo installing includes from include/gen
@(cd include/gen ; for j in *.*P; do \
cmp -s $$j ${DESTDIR}/usr/include/g++/gen/$$j || \
@@ -29,15 +25,15 @@ beforeinstall:
done)
@echo installing includes from libstdc++/std
@(cd libstdc++/std ; for j in *.h; do \
- cmp -s $$j ${DESTDIR}/usr/libstdc++/g++/std/$$j || \
+ cmp -s $$j ${DESTDIR}/usr/include/g++/std/$$j || \
install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
- ${DESTDIR}/usr/libstdc++/g++/std/$$j; \
+ ${DESTDIR}/usr/include/g++/std/$$j; \
done)
@echo installing includes from libstdc++/stl
@(cd libstdc++/stl ; for j in *.h; do \
- cmp -s $$j ${DESTDIR}/usr/libstdc++/g++/stl/$$j || \
+ cmp -s $$j ${DESTDIR}/usr/include/g++stl/$$j || \
install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
- ${DESTDIR}/usr/libstdc++/g++/stl/$$j; \
+ ${DESTDIR}/usr/include/g++/stl/$$j; \
done)
.include <bsd.subdir.mk>
diff --git a/gnu/lib/libg++/libg++2netbsd b/gnu/lib/libg++/libg++2netbsd
index 59e1c7d92a1..220a7f2d78a 100644
--- a/gnu/lib/libg++/libg++2netbsd
+++ b/gnu/lib/libg++/libg++2netbsd
@@ -1,6 +1,6 @@
#!/usr/gnu/bin/perl
#
-# $NetBSD: libg++2netbsd,v 1.3 1996/03/11 02:38:44 thorpej Exp $
+# $NetBSD: libg++2netbsd,v 1.4 1996/03/11 04:58:24 thorpej Exp $
#
# Perl script to convert a standard distribution directory for libg++ into
# a NetBSD source tree.
@@ -419,8 +419,6 @@ __END__
SUBDIR= libg++ libstdc++ # libio libiostream
-INCLUDEDIRS= include libg++/src
-
beforeinstall:
install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}/usr/include/g++
@@ -430,14 +428,12 @@ beforeinstall:
${DESTDIR}/usr/include/g++/std
install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
${DESTDIR}/usr/include/g++/stl
- @-for i in ${INCLUDEDIRS}; do \
- echo installing includes from $$i ; \
- (cd $$i; for j in *.[ih]; do \
- cmp -s $$j ${DESTDIR}/usr/include/g++/$$j || \
- install -c -o ${BINOWN} -g ${BINGRP} -m 644 $$j \
- ${DESTDIR}/usr/include/g++/$$j; \
- done); \
- done
+ @echo installing includes from libg++/src
+ @(cd libg++/src ; for j in *.[ih]; do \
+ cmp -s $$j ${DESTDIR}/usr/include/g++/$$j || \
+ install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
+ ${DESTDIR}/usr/include/g++/$$j; \
+ done)
@echo installing includes from include/gen
@(cd include/gen ; for j in *.*P; do \
cmp -s $$j ${DESTDIR}/usr/include/g++/gen/$$j || \
@@ -446,15 +442,15 @@ beforeinstall:
done)
@echo installing includes from libstdc++/std
@(cd libstdc++/std ; for j in *.h; do \
- cmp -s $$j ${DESTDIR}/usr/libstdc++/g++/std/$$j || \
+ cmp -s $$j ${DESTDIR}/usr/include/g++/std/$$j || \
install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
- ${DESTDIR}/usr/libstdc++/g++/std/$$j; \
+ ${DESTDIR}/usr/include/g++/std/$$j; \
done)
@echo installing includes from libstdc++/stl
@(cd libstdc++/stl ; for j in *.h; do \
- cmp -s $$j ${DESTDIR}/usr/libstdc++/g++/stl/$$j || \
+ cmp -s $$j ${DESTDIR}/usr/include/g++/stl/$$j || \
install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
- ${DESTDIR}/usr/libstdc++/g++/stl/$$j; \
+ ${DESTDIR}/usr/include/g++/stl/$$j; \
done)
.include <bsd.subdir.mk>