diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2003-11-24 16:56:00 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2003-11-24 16:56:00 +0000 |
commit | 96e6e38c2b8b22aa660b7a47cd30e59401245c90 (patch) | |
tree | 87a3d9046e164ff69371b88807d97c3e9a03f0bb /gnu/lib/libiberty | |
parent | b8c5af11e363ad07183c65304d32063b7369d312 (diff) |
Fix build for new location
Diffstat (limited to 'gnu/lib/libiberty')
-rw-r--r-- | gnu/lib/libiberty/Makefile.bsd-wrapper | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/gnu/lib/libiberty/Makefile.bsd-wrapper b/gnu/lib/libiberty/Makefile.bsd-wrapper index d77a378e5dc..542d8c68b0f 100644 --- a/gnu/lib/libiberty/Makefile.bsd-wrapper +++ b/gnu/lib/libiberty/Makefile.bsd-wrapper @@ -1,20 +1,11 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2003/11/24 16:53:23 espie Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2003/11/24 16:55:59 espie Exp $ LIB= iberty -CPPFLAGS+= -DHAVE_CONFIG_H -I$(.CURDIR) -I$(.CURDIR)/../include -I$(.OBJDIR) - -# XXX -- GNUism -# 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 -# substitutions to not generate output. -.ifmake !obj && !clean && !cleandir -PREREQ!= test ! -f $(.OBJDIR)/needed-list && \ - (cd $(.CURDIR); \ - $(MAKE) -f Makefile.bsd-wrapper1 needed-list); \ - echo 'Prerequisites made' -HOST_FILES!= cat $(.OBJDIR)/needed-list -.endif +CPPFLAGS+= -DHAVE_CONFIG_H -I$(.CURDIR) -I$(.CURDIR)/include -I$(.OBJDIR) + +HOST_FILES!= cat $(.OBJDIR)/needed-list 2>/dev/null||true + +.PATH: ${.CURDIR}/src SRCS= argv.c choose-temp.c concat.c cplus-dem.c dyn-string.c \ fdmatch.c getopt.c getopt1.c getpwd.c getruntime.c \ @@ -35,4 +26,17 @@ CLEANFILES+= insque.o insque.go insque.po insque.so # and more CLEANFILES+=Makefile config.cache config.log stamp-h xhost-mkfrag testsuite/Makefile + +depend: needed-list + +needed-list: config.status + ${MAKE} ${GNUCFLAGS} CC=${CC} needed-list + +config.status: Makefile.in configure + PATH="/bin:/usr/bin:/sbin:/usr/sbin" \ + INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP}" \ + /bin/sh ${.CURDIR}/src/configure \ + --prefix=/usr --with-local-prefix=/usr ${CF} \ + && touch config.status + .include <bsd.lib.mk> |