Changeset 5674:8ffa3afc2d9e in roaraudio
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
r5672 r5674 6 6 * Added new configure option '--root' (Closes: #326) 7 7 * Improved roar-config. 8 * Install parts from build system (Closes: #325) 8 9 9 10 v. 1.0beta6 - Fri Sep 21 2012 18:03 CEST -
Makefile
r5426 r5674 47 47 mkdir -p '$(DESTDIR)$(PREFIX_PLUGINS)/$(DEV_VENDOR)-$(DEV_VENDOR_NAME)/universal/' 48 48 mkdir -p '$(DESTDIR)$(PREFIX_PLUGINS)/$(DEV_VENDOR)-$(DEV_VENDOR_NAME)/roard/$(DEV_VENDOR)-$(DEV_VENDOR_NAME)' 49 mkdir -p '$(DESTDIR)$(PREFIX_BUILDSYSTEM)' 49 50 set -e; cd doc; $(MAKE) prep-install-dirs; cd .. 50 51 … … 60 61 set -e; cd doc; $(MAKE) install; cd .. 61 62 set -e; for i in $(PLUGINS); do if [ "$$i" != '' ]; then cd $$i; $(MAKE) install; cd ../..; fi; done 63 cp $(cp_v) build-system/*.* '$(DESTDIR)$(PREFIX_BUILDSYSTEM)' 62 64 63 65 semi-install: prep-install … … 72 74 set -e; cd doc; $(MAKE) semi-install; cd .. 73 75 set -e; for i in $(PLUGINS); do if [ "$$i" != '' ]; then cd $$i; $(MAKE) semi-install; cd ../..; fi; done 76 ln -fs `pwd`/build-system/*.* '$(DESTDIR)$(PREFIX_BUILDSYSTEM)' -
configure
r5673 r5674 25 25 PREFIX_COMP_BINS='' 26 26 PREFIX_PLUGINS='' 27 PREFIX_BUILDSYSTEM='' 27 28 28 29 CDROM_IS_DEV=true … … 157 158 echo '--prefix-comp-bins DIR - Set prefix for compatibility binaries (default: $PREFIX_LIB/roaraudio/compbins)' 158 159 echo '--prefix-plugins DIR - Set prefix for plugin search path (default: $PREFIX_LIB/roaraudio/plugins)' 160 echo '--prefix-buildsystem DIR - Set prefix for plugin search path (default: $PREFIX_LIB/roaraudio/build-system)' 159 161 echo 160 162 echo '--default-rate RATE - Set default sample rate for roard and roarclients' … … 418 420 shift; 419 421 ;; 422 '--prefix-buildsystem') 423 PREFIX_BUILDSYSTEM="$2" 424 shift; 425 ;; 420 426 #################################### 421 427 # autof* options block: … … 428 434 '--prefix-plugins='*) 429 435 PREFIX_PLUGINS=$(echo "$1" | cut -d= -f2) 436 ;; 437 '--prefix-buildsystem='*) 438 PREFIX_BUILDSYSTEM=$(echo "$1" | cut -d= -f2) 430 439 ;; 431 440 #################################### … … 503 512 504 513 update_prefixes 505 [ "$PREFIX_COMP_LIBS" = '' ] && PREFIX_COMP_LIBS="$PREFIX_LIB/roaraudio/complibs/" 506 [ "$PREFIX_COMP_BINS" = '' ] && PREFIX_COMP_BINS="$PREFIX_LIB/roaraudio/compbins/" 507 [ "$PREFIX_PLUGINS" = '' ] && PREFIX_PLUGINS="$PREFIX_LIB/roaraudio/plugins/" 514 [ "$PREFIX_COMP_LIBS" = '' ] && PREFIX_COMP_LIBS="$PREFIX_LIB/roaraudio/complibs/" 515 [ "$PREFIX_COMP_BINS" = '' ] && PREFIX_COMP_BINS="$PREFIX_LIB/roaraudio/compbins/" 516 [ "$PREFIX_PLUGINS" = '' ] && PREFIX_PLUGINS="$PREFIX_LIB/roaraudio/plugins/" 517 [ "$PREFIX_BUILDSYSTEM" = '' ] && PREFIX_BUILDSYSTEM="$PREFIX_LIB/roaraudio/build-system/" 508 518 509 519 [ "$DEFAULT_GRP" = '' ] && DEFAULT_GRP='audio' … … 526 536 echo "PREFIX_COMP_BINS=$PREFIX_COMP_BINS" 527 537 echo "PREFIX_PLUGINS=$PREFIX_PLUGINS" 538 echo "PREFIX_BUILDSYSTEM=$PREFIX_BUILDSYSTEM" 528 539 echo 529 540 $COMP_LIBS && echo "comp_libs=libroar libroardsp libroarmidi libroarlight libroareio" … … 566 577 echo "#define ROAR_PREFIX_COMP_BINS \"$PREFIX_COMP_BINS\"" 567 578 echo "#define ROAR_PREFIX_PLUGINS \"$PREFIX_PLUGINS\"" 579 echo "#define ROAR_PREFIX_BUILDSYSTEM \"$PREFIX_BUILDSYSTEM\"" 568 580 echo 569 581 $MINIMAL && echo '#define ROAR_MINIMAL' -
roarclients/roar-config.c
r5673 r5674 66 66 {"prefix-comp-bins", ROAR_PREFIX_COMP_BINS}, 67 67 {"prefix-plugins", ROAR_PREFIX_PLUGINS}, 68 {"prefix-buildsystem", ROAR_PREFIX_BUILDSYSTEM}, 68 69 {"<<<END>>>", NULL} 69 70 };
Note: See TracChangeset
for help on using the changeset viewer.