Browse Source

Install all carla binaries into PREFIX/lib/carla

tags/v0.9.0
falkTX 12 years ago
parent
commit
e09ae7cf1b
2 changed files with 7 additions and 3 deletions
  1. +6
    -3
      Makefile
  2. +1
    -0
      data/carla

+ 6
- 3
Makefile View File

@@ -256,8 +256,6 @@ install:
data/claudia-launcher \
data/carla \
data/carla-control \
c++/carla-bridge/carla-bridge-* \
c++/carla-discovery/carla-discovery-* \
c++/jackmeter/cadence-jackmeter \
c++/xycontroller/cadence-xycontroller \
$(DESTDIR)$(PREFIX)/bin/
@@ -312,7 +310,12 @@ install:

# Install main code
install -m 755 src/*.py $(DESTDIR)$(PREFIX)/share/cadence/src/
install -m 755 c++/carla-backend/*.so $(DESTDIR)$(PREFIX)/lib/carla/

install -m 755 \
c++/carla-backend/*.so \
c++/carla-bridge/carla-bridge-* \
c++/carla-discovery/carla-discovery-* \
$(DESTDIR)$(PREFIX)/lib/carla/

# Install addtional stuff for Cadence
install -m 644 data/pulse2jack/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2jack/


+ 1
- 0
data/carla View File

@@ -7,4 +7,5 @@ else
fi

INSTALL_PREFIX="X-PREFIX-X"
export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
exec $PYTHON $INSTALL_PREFIX/share/cadence/src/carla.py --with-libprefix="$INSTALL_PREFIX" "$@"

Loading…
Cancel
Save