diff options
| author | bland <bland@FreeBSD.org> | 2005-11-14 21:01:26 +0800 |
|---|---|---|
| committer | bland <bland@FreeBSD.org> | 2005-11-14 21:01:26 +0800 |
| commit | 754f0ba61a45cbfc42db39b34d8b58d1bad51b54 (patch) | |
| tree | 543285578937a22a6cc676d797e8ba97f1f924b7 | |
| parent | 9a708a9a38490406278309e1ec3386dfe6f243a1 (diff) | |
| download | freebsd-ports-gnome-754f0ba61a45cbfc42db39b34d8b58d1bad51b54.tar.gz freebsd-ports-gnome-754f0ba61a45cbfc42db39b34d8b58d1bad51b54.tar.zst freebsd-ports-gnome-754f0ba61a45cbfc42db39b34d8b58d1bad51b54.zip | |
- Avoid duplicates in built-in PC_PATH.
- Remove obsolete LIBTOOL* hints.
| -rw-r--r-- | devel/pkg-config/Makefile | 13 | ||||
| -rw-r--r-- | devel/pkgconfig/Makefile | 13 |
2 files changed, 18 insertions, 8 deletions
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile index 13be163bfdb6..260a66e24cbc 100644 --- a/devel/pkg-config/Makefile +++ b/devel/pkg-config/Makefile @@ -19,15 +19,20 @@ COMMENT= A utility to retrieve information about installed libraries USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnometarget -LIBTOOLFILES= glib-1.2.8/configure -LIBTOOLFLAGS= --disable-ltlibs \ - --disable-shared MAN1= pkg-config.1 .include <bsd.port.pre.mk> +PC_PATH=${PREFIX}/libdata/pkgconfig +.if ${LOCALBASE} != ${PREFIX} +PC_PATH:= ${PC_PATH}:${LOCALBASE}/libdata/pkgconfig +.endif +.if ${X11BASE} != ${PREFIX} +PC_PATH:= ${PC_PATH}:${X11BASE}/libdata/pkgconfig +.endif + CONFIGURE_ARGS= --disable-threads \ - --with-pc-path="${PREFIX}/libdata/pkgconfig:${LOCALBASE}/libdata/pkgconfig:${X11BASE}/libdata/pkgconfig" + --with-pc-path="${PC_PATH}" .include <bsd.port.post.mk> diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile index 13be163bfdb6..260a66e24cbc 100644 --- a/devel/pkgconfig/Makefile +++ b/devel/pkgconfig/Makefile @@ -19,15 +19,20 @@ COMMENT= A utility to retrieve information about installed libraries USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 USE_GNOME= gnometarget -LIBTOOLFILES= glib-1.2.8/configure -LIBTOOLFLAGS= --disable-ltlibs \ - --disable-shared MAN1= pkg-config.1 .include <bsd.port.pre.mk> +PC_PATH=${PREFIX}/libdata/pkgconfig +.if ${LOCALBASE} != ${PREFIX} +PC_PATH:= ${PC_PATH}:${LOCALBASE}/libdata/pkgconfig +.endif +.if ${X11BASE} != ${PREFIX} +PC_PATH:= ${PC_PATH}:${X11BASE}/libdata/pkgconfig +.endif + CONFIGURE_ARGS= --disable-threads \ - --with-pc-path="${PREFIX}/libdata/pkgconfig:${LOCALBASE}/libdata/pkgconfig:${X11BASE}/libdata/pkgconfig" + --with-pc-path="${PC_PATH}" .include <bsd.port.post.mk> |