diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-06-29 13:01:24 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-06-29 13:01:24 +0000 |
commit | f9d9cc439473d8a6e9db1ca8ee3712961a9a624b (patch) | |
tree | b075422c72ca59fd05e5411065e5441a3ca730a9 /gnu/usr.bin | |
parent | 52bc20628b0d28a85489444e50302c083b0b52f8 (diff) |
correctly install bc as gnubc, and still install bcwrap as bc
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r-- | gnu/usr.bin/bc/Makefile.bsd-wrapper | 12 | ||||
-rw-r--r-- | gnu/usr.bin/bc/bc/Makefile.am | 4 | ||||
-rw-r--r-- | gnu/usr.bin/bc/bc/Makefile.in | 18 |
3 files changed, 17 insertions, 17 deletions
diff --git a/gnu/usr.bin/bc/Makefile.bsd-wrapper b/gnu/usr.bin/bc/Makefile.bsd-wrapper index 68d942e2d19..a11e7f9e0e6 100644 --- a/gnu/usr.bin/bc/Makefile.bsd-wrapper +++ b/gnu/usr.bin/bc/Makefile.bsd-wrapper @@ -1,14 +1,14 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.1 1998/06/29 00:19:01 millert Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.2 1998/06/29 13:01:20 deraadt Exp $ + +SUBDIR=bcwrap MAN= doc/bc.1 doc/dc.1 #CLEANFILES= LDFLAGS+= -s ${LDSTATIC} GNUCFLAGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -all: config.status wrapper +all: config.status ${MAKE} ${GNUCFLAGS} - -wrapper: cd ${.CURDIR}/bcwrap && ${MAKE} .FORCE: .IGNORE @@ -38,9 +38,9 @@ maninstall: .endif install: maninstall - cd ${.CURDIR}/bcwrap && ${MAKE} install ${MAKE} ${GNUCFLAGS} prefix=${DESTDIR}/usr \ - bindir=${DESTDIR}/usr/bin infodir=${PREFIX}/usr/share/info + bindir=${DESTDIR}/usr/bin infodir=${PREFIX}/usr/share/info install + cd ${.CURDIR}/bcwrap && ${MAKE} install clean cleandir: -@if [ -e Makefile ]; then ${MAKE} distclean; fi diff --git a/gnu/usr.bin/bc/bc/Makefile.am b/gnu/usr.bin/bc/bc/Makefile.am index d02daf0aedc..83ecd88d240 100644 --- a/gnu/usr.bin/bc/bc/Makefile.am +++ b/gnu/usr.bin/bc/bc/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -bin_PROGRAMS = bc +bin_PROGRAMS = gnubc -bc_SOURCES = main.c bc.y scan.l execute.c load.c storage.c util.c global.c +gnubc_SOURCES = main.c bc.y scan.l execute.c load.c storage.c util.c global.c EXTRA_DIST = bc.h fix-libmath_h libmath.b sbc.y noinst_HEADERS = libmath.h diff --git a/gnu/usr.bin/bc/bc/Makefile.in b/gnu/usr.bin/bc/bc/Makefile.in index df3620a0811..b09ed48d464 100644 --- a/gnu/usr.bin/bc/bc/Makefile.in +++ b/gnu/usr.bin/bc/bc/Makefile.in @@ -66,7 +66,7 @@ YACC = @YACC@ bin_PROGRAMS = gnubc -bc_SOURCES = main.c bc.y scan.l execute.c load.c storage.c util.c global.c +gnubc_SOURCES = main.c bc.y scan.l execute.c load.c storage.c util.c global.c EXTRA_DIST = bc.h fix-libmath_h libmath.b sbc.y noinst_HEADERS = libmath.h @@ -94,11 +94,11 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -bc_OBJECTS = main.o bc.o scan.o execute.o load.o storage.o util.o \ +gnubc_OBJECTS = main.o bc.o scan.o execute.o load.o storage.o util.o \ global.o -bc_LDADD = $(LDADD) -bc_DEPENDENCIES = ../lib/libbc.a -bc_LDFLAGS = +gnubc_LDADD = $(LDADD) +gnubc_DEPENDENCIES = ../lib/libbc.a +gnubc_LDFLAGS = LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ LEXLIB = @LEXLIB@ CFLAGS = @CFLAGS@ @@ -113,8 +113,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar GZIP = --best -SOURCES = $(bc_SOURCES) -OBJECTS = $(bc_OBJECTS) +SOURCES = $(gnubc_SOURCES) +OBJECTS = $(gnubc_OBJECTS) all: Makefile $(PROGRAMS) $(HEADERS) @@ -172,9 +172,9 @@ distclean-compile: maintainer-clean-compile: -bc: $(bc_OBJECTS) $(bc_DEPENDENCIES) +gnubc: $(gnubc_OBJECTS) $(gnubc_DEPENDENCIES) @rm -f bc - $(LINK) $(bc_LDFLAGS) $(bc_OBJECTS) $(bc_LDADD) $(LIBS) + $(LINK) $(gnubc_LDFLAGS) $(gnubc_OBJECTS) $(gnubc_LDADD) $(LIBS) #.y.c: # $(YACC) $(YFLAGS) $< && mv y.tab.c $*.c # if test -f y.tab.h; then \ |