Changeset 2845:411d444a473c in roaraudio

Timestamp:

10/04/09 01:17:58 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

PREFIX_COMP -> PREFIX_COMP_LIBS, added PREFIX_COMP_BINS

Files:

• Makefile (modified) (3 diffs)
• configure (modified) (5 diffs)
• roarclients/Makefile (modified) (1 diff)
• roarclients/roarify.sht (modified) (2 diffs)

Makefile

@@ -25 +25 @@
         mkdir -p '$(DESTDIR)$(PREFIX_INC)'
         mkdir -p '$(DESTDIR)$(PREFIX_MAN)'
-        mkdir -p '$(DESTDIR)$(PREFIX_COMP)'
+        mkdir -p '$(DESTDIR)$(PREFIX_COMP_LIBS)'
+        mkdir -p '$(DESTDIR)$(PREFIX_COMP_BINS)'
         cd doc; make prep-install-dirs; cd ..
 
@@ -31 +32 @@
         cp $(cp_v) lib/roar*     '$(DESTDIR)$(PREFIX_BIN)'
         cp $(cp_v) lib/lib*$(SHARED_SUFFIX)*  '$(DESTDIR)$(PREFIX_LIB)'
-        sh -c 'cd lib; for file in $(COMP_LIB); do for i in "" .{0,1}; do ln -fs '$(DESTDIR)$(PREFIX_LIB)'/$$file$(SHARED_SUFFIX) '$(DESTDIR)$(PREFIX_COMP)'/`echo $$file | sed s/roar//`$(SHARED_SUFFIX)$$i; done; done'
+        sh -c 'cd lib; for file in $(COMP_LIB); do for i in "" .{0,1}; do ln -fs '$(DESTDIR)$(PREFIX_LIB)'/$$file$(SHARED_SUFFIX) '$(DESTDIR)$(PREFIX_COMP_LIBS)'/`echo $$file | sed s/roar//`$(SHARED_SUFFIX)$$i; done; done'
         sh -c 'for file in include/roar* include/lib*; do cp $(cp_v) -r $$file '$(DESTDIR)$(PREFIX_INC)'/; done'
         cd doc; make install; cd ..
@@ -39 +40 @@
         sh -c 'for file in lib/roar*;    do ln -fs `pwd`/$$file '$(DESTDIR)$(PREFIX_BIN)'/; done'
         sh -c 'for file in lib/lib*$(SHARED_SUFFIX)*; do ln -fs `pwd`/$$file '$(DESTDIR)$(PREFIX_LIB)'/; done'
-        sh -c 'cd lib; for file in $(COMP_LIB); do for i in "" .{0,1}; do ln -fs `pwd`/$$file$(SHARED_SUFFIX) '$(DESTDIR)$(PREFIX_COMP)'/`echo $$file | sed s/roar//`$(SHARED_SUFFIX)$$i; done; done'
+        sh -c 'cd lib; for file in $(COMP_LIB); do for i in "" .{0,1}; do ln -fs `pwd`/$$file$(SHARED_SUFFIX) '$(DESTDIR)$(PREFIX_COMP_LIBS)'/`echo $$file | sed s/roar//`$(SHARED_SUFFIX)$$i; done; done'
         sh -c 'for file in include/roar* include/lib*; do ln -fs `pwd`/$$file '$(DESTDIR)$(PREFIX_INC)'/; done'
         cd doc; make semi-install; cd ..

configure

@@ -36 +36 @@
 PREFIX_INC=''
 PREFIX_MAN=''
-PREFIX_COMP=''
+PREFIX_COMP_LIBS=''
+PREFIX_COMP_BINS=''
 
 CDROM_IS_DEV=true
@@ -177 +178 @@
    echo '--prefix-inc DIR            - Set prefix for include files (default: $PREFIX/include)'
    echo '--prefix-man DIR            - Set prefix for manpages (default: $PREFIX/man)'
-   echo '--prefix-comp DIR           - Set prefix for compatibility librarys (default: $PREFIX_LIB/roaraudio/complibs)'
+   echo '--prefix-comp-libs DIR      - Set prefix for compatibility librarys (default: $PREFIX_LIB/roaraudio/complibs)'
+   echo '--prefix-comp-bins DIR      - Set prefix for compatibility binarys  (default: $PREFIX_LIB/roaraudio/compbins)'
    echo
    echo '--default-rate RATE         - Set default sample rate for roard and roarclients'
@@ -402 +404 @@
    shift;
   ;;
-  '--prefix-comp')
-   PREFIX_COMP="$2"
+  # we should remove --prefix-comp soon
+  '--prefix-comp'|'--prefix-comp-libs')
+   PREFIX_COMP_LIBS="$2"
+   shift;
+  ;;
+  '--prefix-comp-libs')
+   PREFIX_COMP_BINS="$2"
    shift;
   ;;
@@ -730 +737 @@
 [ "$PREFIX_INC"  = '' ] && PREFIX_INC="$PREFIX/include/"
 [ "$PREFIX_MAN"  = '' ] && PREFIX_MAN="$PREFIX/share/man/"
-[ "$PREFIX_COMP" = '' ] && PREFIX_COMP="$PREFIX_LIB/roaraudio/complibs/"
+[ "$PREFIX_COMP_LIBS" = '' ] && PREFIX_COMP_LIBS="$PREFIX_LIB/roaraudio/complibs/"
+[ "$PREFIX_COMP_BINS" = '' ] && PREFIX_COMP_BINS="$PREFIX_LIB/roaraudio/compbins/"
 
 [ "$DEFAULT_GRP" = '' ] && DEFAULT_GRP='audio'
@@ -758 +766 @@
  echo "PREFIX_INC=$PREFIX_INC"
  echo "PREFIX_MAN=$PREFIX_MAN"
- echo "PREFIX_COMP=$PREFIX_COMP"
+ echo "PREFIX_COMP_LIBS=$PREFIX_COMP_LIBS"
+ echo "PREFIX_COMP_BINS=$PREFIX_COMP_BINS"
  echo
  $COMP_LIBS     && echo "comp_libs=libroar libroardsp libroarmidi libroarlight libroareio"

roarclients/Makefile

@@ -92 +92 @@
 roarify.sht:
 roarify: roarify.sht
-        sed 's#%%%PREFIX_COMP%%%#$(PREFIX_COMP)#g; s#%%%PREFIX_LIB%%%#$(PREFIX_LIB)#g;' < roarify.sht > roarify
+        sed 's#%%%PREFIX_COMP_LIBS%%%#$(PREFIX_COMP_LIBS)#g; s#%%%PREFIX_COMP_BINS%%%#$(PREFIX_COMP_BINS)#g; s#%%%PREFIX_LIB%%%#$(PREFIX_LIB)#g;' < roarify.sht > roarify
         chmod +rx roarify

roarclients/roarify.sht

@@ -32 +32 @@
   ;;
   '--load')
-   LD_PRELOAD="%%%PREFIX_COMP%%%/lib$1.so $LD_PRELOAD"
+   LD_PRELOAD="%%%PREFIX_COMP_LIBS%%%/lib$1.so $LD_PRELOAD"
    shift;
   ;;
@@ -52 +52 @@
 
 export LD_PRELOAD="%%%PREFIX_LIB%%%/libroar.so $LD_PRELOAD"
-export LD_LIBRARY_PATH='%%%PREFIX_COMP%%%'":$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH='%%%PREFIX_COMP_LIBS%%%'":$LD_LIBRARY_PATH"
+export PATH='%%%PREFIX_COMP_BINS%%%'":$PATH"
 
 exec -- "$CMD" "$@"