diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-09 01:22:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-09 01:22:29 +0000 |
| commit | 977af731ca5f76799cdb7aa14e4f071c38f34999 (patch) | |
| tree | 9c547df2958c0e903c6b4563e220a25316cde504 /korundum | |
| parent | dff3f779e70064ee7d7a34a3afb003c7999f8994 (diff) | |
| download | tdebindings-977af731ca5f76799cdb7aa14e4f071c38f34999.tar.gz tdebindings-977af731ca5f76799cdb7aa14e4f071c38f34999.zip | |
* Updated automake/autoconf
* Detects Python 2.6
* Various compilation fixes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1071924 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korundum')
| -rw-r--r-- | korundum/rubylib/korundum/Makefile.am | 2 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/configure.in.in | 2 | ||||
| -rw-r--r-- | korundum/rubylib/korundum/lib/KDE/Makefile.am | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am index c135f4e9..56427288 100644 --- a/korundum/rubylib/korundum/Makefile.am +++ b/korundum/rubylib/korundum/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) -rubylibdir = $(RUBY_SITEARCHDIR) +rubylibdir = $(RUBY_ARCHDIR) rubylib_LTLIBRARIES = korundum.la korundum_la_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 korundum_la_METASOURCES = AUTO diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in index de265e6d..81ad0bcb 100644 --- a/korundum/rubylib/korundum/configure.in.in +++ b/korundum/rubylib/korundum/configure.in.in @@ -7,9 +7,11 @@ else RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'` RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'` RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'` + RUBY_RUBYLIBDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubylibdir"@:>@)'` AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR]) AC_SUBST(RUBY_ARCHDIR) AC_SUBST(RUBY_SITEARCHDIR) + AC_SUBST(RUBY_RUBYLIBDIR) AC_SUBST(RUBY_SITEDIR) fi diff --git a/korundum/rubylib/korundum/lib/KDE/Makefile.am b/korundum/rubylib/korundum/lib/KDE/Makefile.am index 3f7b0c53..e69bcb05 100644 --- a/korundum/rubylib/korundum/lib/KDE/Makefile.am +++ b/korundum/rubylib/korundum/lib/KDE/Makefile.am @@ -1,5 +1,5 @@ -kderubylibdir = $(RUBY_SITEDIR)/KDE +kderubylibdir = $(RUBY_RUBYLIBDIR)/KDE kderubylib_DATA = korundum.rb -rubylibdir = $(RUBY_SITEDIR) +rubylibdir = $(RUBY_RUBYLIBDIR) rubylib_DATA = Korundum.rb |