From 8ad291c33e7fff3167d68403a3fa605b894b3792 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Sat, 5 Jan 2002 08:57:29 +0000 Subject: Make pilot-link install directly into PREFIX. This should allow pilot-link and all dependents to build correctly on bento. --- deskutils/kdepim/Makefile | 4 +--- deskutils/kdepim3/Makefile | 4 +--- deskutils/kdepim4/Makefile | 4 +--- deskutils/kdepim44/Makefile | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) (limited to 'deskutils') diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile index df618f1d2dd2..e6aa838e6de1 100644 --- a/deskutils/kdepim/Makefile +++ b/deskutils/kdepim/Makefile @@ -26,8 +26,6 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/pilot/include \ - --with-extra-libs=${LOCALBASE}/pilot/lib .if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) CONFIGURE_ARGS+=--enable-objprelink .endif @@ -37,7 +35,7 @@ CONFIGURE_ARGS+=--enable-final .if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) CONFIGURE_ARGS+=--disable-debug .endif -QTCPPFLAGS= -I${LOCALBASE}/pilot/include -L${LOCALBASE}/pilot/lib +QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" MAKE_ENV= ${CONFIGURE_ENV} diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index df618f1d2dd2..e6aa838e6de1 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -26,8 +26,6 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/pilot/include \ - --with-extra-libs=${LOCALBASE}/pilot/lib .if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) CONFIGURE_ARGS+=--enable-objprelink .endif @@ -37,7 +35,7 @@ CONFIGURE_ARGS+=--enable-final .if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) CONFIGURE_ARGS+=--disable-debug .endif -QTCPPFLAGS= -I${LOCALBASE}/pilot/include -L${LOCALBASE}/pilot/lib +QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" MAKE_ENV= ${CONFIGURE_ENV} diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index df618f1d2dd2..e6aa838e6de1 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -26,8 +26,6 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/pilot/include \ - --with-extra-libs=${LOCALBASE}/pilot/lib .if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) CONFIGURE_ARGS+=--enable-objprelink .endif @@ -37,7 +35,7 @@ CONFIGURE_ARGS+=--enable-final .if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) CONFIGURE_ARGS+=--disable-debug .endif -QTCPPFLAGS= -I${LOCALBASE}/pilot/include -L${LOCALBASE}/pilot/lib +QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" MAKE_ENV= ${CONFIGURE_ENV} diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index df618f1d2dd2..e6aa838e6de1 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -26,8 +26,6 @@ USE_BISON= yes USE_BZIP2= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-extra-includes=${LOCALBASE}/pilot/include \ - --with-extra-libs=${LOCALBASE}/pilot/lib .if ${MACHINE_ARCH} == "i386" && !defined(NO_KDE_OBJPRELINK) CONFIGURE_ARGS+=--enable-objprelink .endif @@ -37,7 +35,7 @@ CONFIGURE_ARGS+=--enable-final .if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG) CONFIGURE_ARGS+=--disable-debug .endif -QTCPPFLAGS= -I${LOCALBASE}/pilot/include -L${LOCALBASE}/pilot/lib +QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib QTLDFLAGS= ${QTCPPFLAGS} CONFIGURE_ENV+= LIBS="${QTLDFLAGS}" MAKE_ENV= ${CONFIGURE_ENV} -- cgit v1.2.3