diff options
| author | tron <tron@pkgsrc.org> | 1999-05-20 19:05:42 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1999-05-20 19:05:42 +0000 |
| commit | bbce0dbb3195e0b9bd83adb5335eb30c0643e272 (patch) | |
| tree | 6f131d95d182ffde82a16215176215297ece16bc /x11/gnome-core | |
| parent | 5bac166611cb59974d5bacf083782452b014cc86 (diff) | |
| download | pkgsrc-bbce0dbb3195e0b9bd83adb5335eb30c0643e272.tar.gz | |
No need to patch "configure" to supply preprocessor flags. Using the
"CPPFLAGS" environment variable works fine.
Diffstat (limited to 'x11/gnome-core')
| -rw-r--r-- | x11/gnome-core/Makefile | 6 | ||||
| -rw-r--r-- | x11/gnome-core/patches/patch-aa | 56 |
2 files changed, 5 insertions, 57 deletions
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 0d72e29b1e7..b3844e9755f 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 1999/05/02 15:52:57 tron Exp $ +# $NetBSD: Makefile,v 1.16 1999/05/20 19:05:42 tron Exp $ # DISTNAME= gnome-core-1.0.5 @@ -26,7 +26,9 @@ LOCALSTATEDIR= /var/gnome CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ --with-glib-prefix=${LOCALBASE} +CPPFLAGS= -I${LOCALBASE}/include CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \ - LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} + LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ + CPPFLAGS="${CPPFLAGS}" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-core/patches/patch-aa b/x11/gnome-core/patches/patch-aa index 0be181344a0..a7edfd249de 100644 --- a/x11/gnome-core/patches/patch-aa +++ b/x11/gnome-core/patches/patch-aa @@ -1,36 +1,9 @@ -$NetBSD: patch-aa,v 1.1.1.1 1998/10/07 19:45:26 agc Exp $ +$NetBSD: patch-aa,v 1.2 1999/05/20 19:05:42 tron Exp $ Use NetBSD's own pkglibtool --- configure 1998/10/05 14:27:05 1.1 +++ configure 1998/10/05 14:27:46 -@@ -541,7 +541,7 @@ - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CPP $CPPFLAGS' -+ac_cpp='$CPP $CPPFLAGS -I$LOCALBASE/include' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross -@@ -1043,7 +1043,7 @@ - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CPP $CPPFLAGS' -+ac_cpp='$CPP $CPPFLAGS -I$LOCALBASE/include' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross -@@ -1234,7 +1234,7 @@ - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CPP $CPPFLAGS' -+ac_cpp='$CPP $CPPFLAGS -I$LOCALBASE/include' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross @@ -1710,7 +1710,8 @@ @@ -49,30 +22,3 @@ Use NetBSD's own pkglibtool for ac_prog in $CCC c++ g++ gcc CC cxx cc++ do -@@ -1831,7 +1833,7 @@ - - ac_ext=C - # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CXXCPP $CPPFLAGS' -+ac_cpp='$CXXCPP $CPPFLAGS -I$LOCALBASE/include' - ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cxx_cross -@@ -1857,7 +1859,7 @@ - rm -fr conftest* - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. --ac_cpp='$CPP $CPPFLAGS' -+ac_cpp='$CPP $CPPFLAGS -I$LOCALBASE/include' - ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' - ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - cross_compiling=$ac_cv_prog_cc_cross -@@ -2530,7 +2532,7 @@ - rm -f conf.gtktest - - -- CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $GTK_CFLAGS -I$LOCALBASE/include" - - saved_ldflags="$LDFLAGS" - LDFLAGS="$LDFLAGS $GTK_LIBS" |