diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-12-27 05:18:14 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-12-27 05:18:14 +0800 |
| commit | 56c738fa7bd1609a1294981fa5b6e275726ac97e (patch) | |
| tree | 2cf63e75cdb0ae6a1670486330612f1c887ae3b9 /x11-toolkits/gtk20/files/patch-configure | |
| parent | 63b3455d587b12e4a84258820d1a839c3a2e84c7 (diff) | |
| download | marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.gz marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.bz2 marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.lz marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.xz marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.tar.zst marcuscom-ports-56c738fa7bd1609a1294981fa5b6e275726ac97e.zip | |
Fix gir installation, by tweaking the sed lines in patch-configure.
Thanks to Joe. For the fix and the tweak. (Forgot to credit him last commit).
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13308 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/gtk20/files/patch-configure')
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-configure | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/x11-toolkits/gtk20/files/patch-configure b/x11-toolkits/gtk20/files/patch-configure index d0585868d..d32cd0e73 100644 --- a/x11-toolkits/gtk20/files/patch-configure +++ b/x11-toolkits/gtk20/files/patch-configure @@ -1,14 +1,14 @@ ---- configure.orig 2009-12-25 21:13:23.000000000 +0100 -+++ configure 2009-12-25 21:15:59.000000000 +0100 +--- configure.orig 2009-12-26 21:41:27.000000000 +0100 ++++ configure 2009-12-26 21:51:04.000000000 +0100 @@ -33884,9 +33884,9 @@ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} -+ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|$datadir|\$(datadir)|"` ++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"` INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} -+ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|$libdir|\$(libdir)|"` ++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"` INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection @@ -17,10 +17,10 @@ # Hack around introspection installing into an absolute path breaking distcheck tmp=`pkg-config --variable=datadir gobject-introspection-1.0` -INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$tmp/\$(datadir)} -+INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|$tmp|\$(datadir)|"` ++INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${tmp}|\\\$(datadir)|"` tmp=`pkg-config --variable=libdir gobject-introspection-1.0` -INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$tmp/\$(libdir)} -+INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|$tmp|\$(libdir)|"` ++INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${tmp}|\\\$(libdir)|"` ################################################## # Checks for gtk-doc and docbook-tools |