diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-02-21 10:23:41 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-02-21 10:23:41 +0000 |
| commit | ea5c0da93bc656a5122fa28dcae986a325e2a7b2 (patch) | |
| tree | e7c279c006a47a9b66b7f469c896ee07e53e2bd2 /share | |
| parent | 4cd016e8fd79a4e78b95e1cc843a99e01327885b (diff) | |
Notes
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.lib.mk | 19 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 4 |
2 files changed, 5 insertions, 18 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index ca8807ed1bb4..06ca3561a325 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -37,11 +37,6 @@ SHLIB_NAME?= lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} .endif .endif -.if defined(DESTDIR) && !defined(BOOTSTRAPPING) -CFLAGS+= -I${DESTDIR}/usr/include -CXXINCLUDES+= -I${DESTDIR}/usr/include/g++ -.endif - .if defined(DEBUG_FLAGS) CFLAGS+= ${DEBUG_FLAGS} .endif @@ -196,10 +191,6 @@ lib${LIB}_p.a:: ${POBJS} ${RANLIB} lib${LIB}_p.a .endif -.if defined(DESTDIR) && !defined(BOOTSTRAPPING) -LDDESTDIRENV?= LIBRARY_PATH=${DESTDIR}${SHLIBDIR}:${DESTDIR}${LIBDIR} -.endif - SOBJS+= ${OBJS:.o=.So} .if defined(SHLIB_NAME) @@ -210,13 +201,13 @@ ${SHLIB_NAME}: ${SOBJS} @ln -sf ${SHLIB_NAME} ${SHLIB_LINK} .endif .if ${OBJFORMAT} == aout - @${LDDESTDIRENV} ${CC} -shared -Wl,-x,-assert,pure-text \ + @${CC} -shared -Wl,-x,-assert,pure-text \ -o ${SHLIB_NAME} \ - `lorder ${SOBJS} | tsort -q` ${LDDESTDIR} ${LDADD} + `lorder ${SOBJS} | tsort -q` ${LDADD} .else - @${LDDESTDIRENV} ${CC} -shared -Wl,-x \ + @${CC} -shared -Wl,-x \ -o ${SHLIB_NAME} -Wl,-soname,${SONAME} \ - `lorder ${SOBJS} | tsort -q` ${LDDESTDIR} ${LDADD} + `lorder ${SOBJS} | tsort -q` ${LDADD} .endif .endif @@ -252,7 +243,7 @@ _EXTRADEPEND: .if !defined(NOEXTRADEPEND) && defined(SHLIB_NAME) .if ${OBJFORMAT} == aout echo ${SHLIB_NAME}: \ - `${LDDESTDIRENV} ${CC} -shared -Wl,-f ${LDDESTDIR} ${LDADD}` \ + `${CC} -shared -Wl,-f ${LDADD}` \ >> ${DEPENDFILE} .else .if defined(DPADD) && !empty(DPADD) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 31b3855cc5f6..25c9e0406841 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -11,10 +11,6 @@ __initialized__: .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .s .S CFLAGS+=${COPTS} ${DEBUG_FLAGS} -.if defined(DESTDIR) && !defined(BOOTSTRAPPING) -CFLAGS+= -I${DESTDIR}/usr/include -CXXINCLUDES+= -I${DESTDIR}/usr/include/g++ -.endif .if !defined(DEBUG_FLAGS) STRIP?= -s |