diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-13 12:33:47 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-13 12:33:47 +0000 |
| commit | 7c11e3f1821cac263941b3a35db2fe751a8c43bb (patch) | |
| tree | 70f69da0bd7d51adebd2481907ada1553752ab13 /editors/AbiWord | |
| parent | a75ddf1b330a170a137f9a9986340efd2b4034c9 (diff) | |
- Fix a breakage when at compile time there is a BSD iconv package installed;
- respect CFLAGS.
Reported by: *many*
Notes
Notes:
svn path=/head/; revision=46180
Diffstat (limited to 'editors/AbiWord')
| -rw-r--r-- | editors/AbiWord/Makefile | 3 | ||||
| -rw-r--r-- | editors/AbiWord/files/patch-configure.in-v2.13 | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile index e3c3924981cb..3052351ab1f1 100644 --- a/editors/AbiWord/Makefile +++ b/editors/AbiWord/Makefile @@ -37,7 +37,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAKEFILE= GNUmakefile FIXME= find ${WRKSRC} -name GNUmakefile.in | xargs ${PERL} -pi -e \ - 's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g' + 's|\$$\(libdir\)/\@PACKAGE\@|\$$\(datadir\)/\@PACKAGE\@|g ; \ + s|\@DEFS\@|-I${WRKSRC}/../libiconv/include \@DEFS\@|g' pre-configure: @cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog diff --git a/editors/AbiWord/files/patch-configure.in-v2.13 b/editors/AbiWord/files/patch-configure.in-v2.13 new file mode 100644 index 000000000000..f13c71061dec --- /dev/null +++ b/editors/AbiWord/files/patch-configure.in-v2.13 @@ -0,0 +1,18 @@ + +$FreeBSD$ + +--- configure.in-v2.13.orig Wed Jul 18 01:38:22 2001 ++++ configure.in-v2.13 Mon Aug 13 14:47:43 2001 +@@ -252,10 +252,10 @@ + + if test "$PLATFORM" = "unix"; then + if test "$gnome" = "true"; then +- PLATFORM_CFLAGS="$GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS" ++ PLATFORM_CFLAGS="$CFLAGS $GNOME_CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS" + PLATFORM_LIBS= + else +- PLATFORM_CFLAGS="$GMODULE_CFLAGS $GTK_CFLAGS" ++ PLATFORM_CFLAGS="$CFLAGS $GMODULE_CFLAGS $GTK_CFLAGS" + PLATFORM_LIBS= + fi + fi |