- clean up a leftover in binutils215/ld
authorYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Mon, 10 Jan 2005 05:00:37 +0000 (05:00 +0000)
committerYONETANI Tomokazu <y0netan1@dragonflybsd.org>
Mon, 10 Jan 2005 05:00:37 +0000 (05:00 +0000)
- rm: /usr/libexec/binutils214: is a directory

Noticed-by: David Rhodus
etc/Makefile
gnu/usr.bin/binutils215/ld/Makefile

index 4bd7f29..1789bb8 100644 (file)
@@ -1,6 +1,6 @@
 #      from: @(#)Makefile      5.11 (Berkeley) 5/21/91
 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $
-# $DragonFly: src/etc/Makefile,v 1.35 2005/01/09 16:01:23 joerg Exp $
+# $DragonFly: src/etc/Makefile,v 1.36 2005/01/10 05:00:37 y0netan1 Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=        sendmail
@@ -163,7 +163,7 @@ upgrade_etc:        preupgrade
        csh -c "rm -f ${DESTDIR}/usr/lib/{libstdc++.so,libstdc++.so.3}"
        csh -c "rm -f ${DESTDIR}/usr/lib/{libstdc++_p.a}"
        csh -c "rm -f ${DESTDIR}/usr/bin/CC"
-       rm -f ${DESTDIR}/usr/libexec/binutils214
+       rm -rf ${DESTDIR}/usr/libexec/binutils214
 .endif
        rm -f ${DESTDIR}/usr/bin/makewhatis
        rm -f ${DESTDIR}/usr/sbin/prebind
index bf2a11f..e503fdc 100644 (file)
@@ -1,11 +1,12 @@
-# $DragonFly: src/gnu/usr.bin/binutils215/ld/Attic/Makefile,v 1.1 2004/12/20 13:14:44 asmodai Exp $
+# $DragonFly: src/gnu/usr.bin/binutils215/ld/Attic/Makefile,v 1.2 2005/01/10 05:00:37 y0netan1 Exp $
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/ld
 
 PROG=  ld
-SCRIPTDIR= /usr/libexec/binutils214/ldscripts
+LIBEXEC_BINUTILS= /usr/libexec/binutils215
+SCRIPTDIR= ${LIBEXEC_BINUTILS}/ldscripts
 SRCS+= ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \
        ldgram.y ldlang.c ldlex.l ldmain.c ldmisc.c \
        ldver.c ldwrite.c lexsup.c mri.c
@@ -31,11 +32,11 @@ elf-hints.h:
 .endif
 
 WARNS= 1
-CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libexec/binutils214\"
+CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}${LIBEXEC_BINUTILS}\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd -I${.OBJDIR}/../libbfd
-CFLAGS+= -DBINDIR=\"${TOOLS_PREFIX}/usr/libexec/binutils214\"
-CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/usr/libexec/binutils214\"
+CFLAGS+= -DBINDIR=\"${TOOLS_PREFIX}${LIBEXEC_BINUTILS}\"
+CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}${LIBEXEC_BINUTILS}\"
 NOSHARED?= yes
 DPADD= ${RELTOP}/libbfd/libbfd.a
 DPADD+=        ${RELTOP}/libiberty/libiberty.a