summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1999-04-03 22:52:35 +0000
committerobrien <obrien@FreeBSD.org>1999-04-03 22:52:35 +0000
commit63cec2dc3993cc26f419353694f7fb18079e4a7b (patch)
treea567132d4e9709998cfe124b69cb067999c921ce
parenta20d0ad0922e7d2b340b23936cd45ac02dea0a42 (diff)
downloadFreeBSD-src-63cec2dc3993cc26f419353694f7fb18079e4a7b.zip
FreeBSD-src-63cec2dc3993cc26f419353694f7fb18079e4a7b.tar.gz
Makefile.inc was politing all subdir's with SHLIB_{MAJOR,MINOR} definitions.
Since we aren't keeping all the GNU libs at the same versions, this is useless and causes us to build a shared libgcc, which we don't want to do.
-rw-r--r--gnu/lib/Makefile.inc8
-rw-r--r--gnu/lib/libregex/Makefile11
2 files changed, 7 insertions, 12 deletions
diff --git a/gnu/lib/Makefile.inc b/gnu/lib/Makefile.inc
deleted file mode 100644
index 12f592c..0000000
--- a/gnu/lib/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-
-SHLIB_MAJOR?= 2
-SHLIB_MINOR?= 0
-
-
-# NB: SHLIB major and minor nos. must also be specified in libg++/Makefile.inc
-# (This is due to the deeper tree structure of libg++)
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 60f7bdf..eba5883 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -1,12 +1,15 @@
-# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.18 1996/08/30 02:12:07 peter Exp $
+# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.19 1996/11/16 22:53:42 joerg Exp $
+SUBDIR+= doc
+
+LIB= gnuregex
+SHLIB_MAJOR= 2
+SHLIB_MINOR= 0
-LIB= gnuregex
-CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 -DNO_POSIX_COMPAT=1
SRCS= regex.c
NOMAN= noman
-SUBDIR+= doc
+CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 -DNO_POSIX_COMPAT=1
beforeinstall:
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/regex.h \
OpenPOWER on IntegriCloud