diff options
| author | Eric Blossom | 2010-10-22 21:56:51 -0700 |
|---|---|---|
| committer | Eric Blossom | 2010-11-10 12:13:52 -0800 |
| commit | 1b95d66c179048b086ee8aa6a75a23d1edc006dc (patch) | |
| tree | 78dcf31c79b6160d2af50f68632a2a6228c7f8a1 | |
| parent | 76e6d5ce6c8b43703cabc369e045f7c33f5431a3 (diff) | |
| download | gnuradio-1b95d66c179048b086ee8aa6a75a23d1edc006dc.tar.gz gnuradio-1b95d66c179048b086ee8aa6a75a23d1edc006dc.tar.bz2 gnuradio-1b95d66c179048b086ee8aa6a75a23d1edc006dc.zip | |
Set new install locations for guile scm code and libraries.
I think we may want to rename the guile .so's and install them into
libdir instead...
| -rw-r--r-- | Makefile.common | 4 | ||||
| -rw-r--r-- | Makefile.swig.gen.t | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/Makefile.am | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.common b/Makefile.common index 0e4cb9eb7..32bf2d0bb 100644 --- a/Makefile.common +++ b/Makefile.common @@ -32,6 +32,10 @@ grincludedir = $(includedir)/gnuradio # swig includes swigincludedir = $(grincludedir)/swig +# Guile scheme code ends up under here: +guiledir = $(prefix)/share/guile/site +grguiledir = $(guiledir)/gnuradio + if PYTHON # Install the gnuradio stuff in the appropriate subdirectory # This usually ends up at: diff --git a/Makefile.swig.gen.t b/Makefile.swig.gen.t index 39d11bf25..6f852c367 100644 --- a/Makefile.swig.gen.t +++ b/Makefile.swig.gen.t @@ -41,12 +41,12 @@ # The .so libraries for the guile modules get installed whereever guile # is installed, usually /usr/lib/guile/gnuradio/ # FIXME: determince whether these should be installed with gnuradio. -@NAME@_scmlibdir = @GUILE_PKLIBDIR@/gnuradio +@NAME@_scmlibdir = $(libdir)/guile/gnuradio # The scm files for the guile modules get installed where ever guile # is installed, usually /usr/share/guile/site/@NAME@ # FIXME: determince whether these should be installed with gnuradio. -@NAME@_scmdir = @GUILE_PKDATADIR@/gnuradio +@NAME@_scmdir = $(guiledir)/gnuradio ## SWIG headers are always installed into the same directory. diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index f96352d1a..67d188957 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -55,8 +55,7 @@ if GUILE # This is the top level guile file, which loads all the other scm files # for gnuradio. This has to be installed top level to be found in the # default search path. -guiledir = @GUILE_PKDATADIR@ -guile_DATA = gnuradio_swig.scm +grguile_DATA = gnuradio_swig.scm endif |