| author | Łukasz Jernaś <deejay1@srem.org> | 2010-04-28 05:39:37 (GMT) |
|---|---|---|
| committer | Christian Hergert <chris@dronelabs.com> | 2010-05-02 03:39:45 (GMT) |
| commit | e7b94222dd0a1baa36f3cfc60ee089b0bc47b694 (patch) | |
| tree | 05de4b1ac3d3e8b47ad8eeee14bbeed206688dba | |
| parent | de9a76ce6d3085fceaf65ed302280fe648dbfbc7 (diff) | |
| download | ethos-master.zip ethos-master.tar.gz ethos-master.tar.bz2 | |
Fix build with custom libdirmaster
| -rw-r--r-- | ethos-ui.pc.in | 6 | ||||
| -rw-r--r-- | ethos.pc.in | 6 | ||||
| -rw-r--r-- | ethos/Makefile.am | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ethos-ui.pc.in b/ethos-ui.pc.in index 71f5cb0..af26e8b 100644 --- a/ethos-ui.pc.in +++ b/ethos-ui.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${exec_prefix}/include +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ Name: Ethos UI Description: User interface widgets for Ethos diff --git a/ethos.pc.in b/ethos.pc.in index 3c75642..849367d 100644 --- a/ethos.pc.in +++ b/ethos.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${exec_prefix}/include +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ Name: Ethos Description: Generic plugin engine for GLib diff --git a/ethos/Makefile.am b/ethos/Makefile.am index 959c31b..8efd9b0 100644 --- a/ethos/Makefile.am +++ b/ethos/Makefile.am @@ -44,7 +44,7 @@ libethos_@ETHOS_API_VERSION@_la_CFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DG_LOG_DOMAIN=\"Ethos\" \ -DG_DISABLE_DEPRECATED \ - -DETHOS_PLUGIN_LOADERS_DIR=\""$(prefix)/lib/ethos/plugin-loaders"\" \ + -DETHOS_PLUGIN_LOADERS_DIR=\""$(libdir)/ethos/plugin-loaders"\" \ $(ETHOS_MAINTAINER_CFLAGS) \ $(ETHOS_DEBUG_CFLAGS) \ $(ETHOS_CFLAGS) \ |