diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-09-28 21:56:36 +0200 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-09-28 21:56:36 +0200 |
| commit | 4da30b1131a569109940d64d8f0e51152b17dc75 (patch) | |
| tree | 9f74a16aa4ab871ae1e851ebb94c145d1bffc818 | |
| parent | ee92a56a930bb4e3398723055ac67803b8eb62da (diff) | |
| download | osc-graphics-4da30b1131a569109940d64d8f0e51152b17dc75.tar.gz | |
ensure that chuck wrapper's lib.ck contains the installation path
a custom Makefile rule must be used since the *dir output variables are not fully expanded
| -rw-r--r-- | chuck/Makefile.am | 6 | ||||
| -rw-r--r-- | chuck/lib.ck.in | 16 | ||||
| -rw-r--r-- | configure.ac | 7 |
3 files changed, 17 insertions, 12 deletions
diff --git a/chuck/Makefile.am b/chuck/Makefile.am index 69c805f..867a89c 100644 --- a/chuck/Makefile.am +++ b/chuck/Makefile.am @@ -2,3 +2,9 @@ dist_chuck_DATA = OSCGraphics.ck OSCGraphicsPort.ck OSCGraphicsLayer.ck \ OSCGraphicsBox.ck OSCGraphicsImage.ck OSCGraphicsVideo.ck nodist_chuck_DATA = lib.ck + +CLEANFILES = lib.ck +EXTRA_DIST = lib.ck.in + +lib.ck : lib.ck.in + @SED@ 's|@chuckdir[@]|$(chuckdir)|g' $< >$@ diff --git a/chuck/lib.ck.in b/chuck/lib.ck.in index e73ab98..f4e4c51 100644 --- a/chuck/lib.ck.in +++ b/chuck/lib.ck.in @@ -1,11 +1,7 @@ -"/usr/local" => string prefix; +"@chuckdir@/OSCGraphicsPort.ck" => Machine.add; +"@chuckdir@/OSCGraphicsLayer.ck" => Machine.add; +"@chuckdir@/OSCGraphicsImage.ck" => Machine.add; +"@chuckdir@/OSCGraphicsVideo.ck" => Machine.add; +"@chuckdir@/OSCGraphicsBox.ck" => Machine.add; -prefix+"/share/osc-graphics/chuck" => string path; - -path+"/OSCGraphicsPort.ck" => Machine.add; -path+"/OSCGraphicsLayer.ck" => Machine.add; -path+"/OSCGraphicsImage.ck" => Machine.add; -path+"/OSCGraphicsVideo.ck" => Machine.add; -path+"/OSCGraphicsBox.ck" => Machine.add; - -path+"/OSCGraphics.ck" => Machine.add; +"@chuckdir@/OSCGraphics.ck" => Machine.add; diff --git a/configure.ac b/configure.ac index d12f2b8..dc05739 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,10 @@ AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_BUILD AC_CANONICAL_HOST -chuckdir=$datarootdir/$PACKAGE_TARNAME/chuck +pkgdatadir=$datadir/$PACKAGE_TARNAME +AC_SUBST(pkgdatadir) + +chuckdir=$pkgdatadir/chuck AC_SUBST(chuckdir) # Checks for programs. @@ -23,6 +26,7 @@ AC_PROG_CXX AC_PROG_CC AC_PROG_INSTALL AC_PROG_LIBTOOL +AC_PROG_SED # Checks for libraries. AC_CHECK_PROG(SDL_CONFIG, sdl-config, sdl-config) @@ -87,5 +91,4 @@ AC_CHECK_FUNCS([atexit strdup]) CXXFLAGS="$CXXFLAGS $CFLAGS" AC_CONFIG_FILES([Makefile src/Makefile chuck/Makefile]) -AC_CONFIG_FILES([chuck/lib.ck]) AC_OUTPUT |