Changeset 5810:d44ff4605fa5 in roaraudio
- Timestamp:
- 01/05/13 00:56:36 (11 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
build-system/configure.lib
r5808 r5810 61 61 echo '--prefix DIR - Set general prefix (default: '"$PREFIX"')' 62 62 echo '--prefix-bin DIR - Set prefix for binaries (default: $PREFIX/bin)' 63 echo '--prefix-sbin DIR - Set prefix for system binaries (default: $PREFIX/sbin)' 63 64 echo '--prefix-lib DIR - Set prefix for libraries (default: $PREFIX/libs)' 64 65 echo '--prefix-inc DIR - Set prefix for include files (default: $PREFIX/include)' 65 echo '--prefix-man DIR - Set prefix for manpages (default: $PREFIX/ man)'66 echo '--prefix-man DIR - Set prefix for manpages (default: $PREFIX/share/man)' 66 67 echo '--prefix-pc DIR - Set prefix for pkg-config (default: $PREFIX_LIB/pkgconfig)' 68 echo '--prefix-sysconf DIR - Set prefix for system configuration (default: $PREFIX/etc)' 69 echo '--prefix-dev DIR - Set prefix for devices (default: $PREFIX/dev)' 70 echo '--prefix-doc DIR - Set prefix for documentation (default: $PREFIX/share/doc)' 71 echo '--prefix-tmp DIR - Set prefix for temporary files (default: $PREFIX/tmp)' 72 echo '--prefix-var DIR - Set prefix for variable files (default: $PREFIX/var)' 73 echo '--prefix-cache DIR - Set prefix for application caches (default: $PREFIX_VAR/cache)' 74 echo '--prefix-data DIR - Set prefix for variable application data (default: $PREFIX_VAR/lib)' 75 echo '--prefix-lock DIR - Set prefix for lock files (locked resources) (default: $PREFIX_VAR/lock)' 76 echo '--prefix-log DIR - Set prefix for log files (default: $PREFIX_VAR/log)' 77 echo '--prefix-mail DIR - Set prefix for user'\''s mailboxes (default: $PREFIX_VAR/mail)' 78 echo '--prefix-run DIR - Set prefix for information about the running system (default: $PREFIX_VAR/run)' 79 echo '--prefix-spool DIR - Set prefix for spools (queued jobs) (default: $PREFIX_VAR/spool)' 67 80 echo 68 81 echo '--without-beta - Disable beta code' … … 162 175 SHIFT_COUNT=1 163 176 ;; 177 '--prefix-sbin') 178 PREFIX_SBIN="$2" 179 SHIFT_COUNT=1 180 ;; 164 181 '--prefix-lib') 165 182 PREFIX_LIB="$2" … … 180 197 '--prefix-ckport') 181 198 PREFIX_CKPORT="$2" 199 SHIFT_COUNT=1 200 ;; 201 '--prefix-sysconf') 202 PREFIX_SYSCONF="$2" 203 SHIFT_COUNT=1 204 ;; 205 '--prefix-dev') 206 PREFIX_DEV="$2" 207 SHIFT_COUNT=1 208 ;; 209 '--prefix-doc') 210 PREFIX_DOC="$2" 211 SHIFT_COUNT=1 212 ;; 213 '--prefix-tmp') 214 PREFIX_TMP="$2" 215 SHIFT_COUNT=1 216 ;; 217 '--prefix-var') 218 PREFIX_VAR="$2" 219 SHIFT_COUNT=1 220 ;; 221 '--prefix-cache') 222 PREFIX_CACHE="$2" 223 SHIFT_COUNT=1 224 ;; 225 '--prefix-data') 226 PREFIX_DATA="$2" 227 SHIFT_COUNT=1 228 ;; 229 '--prefix-lock') 230 PREFIX_LOCK="$2" 231 SHIFT_COUNT=1 232 ;; 233 '--prefix-log') 234 PREFIX_LOG="$2" 235 SHIFT_COUNT=1 236 ;; 237 '--prefix-mail') 238 PREFIX_MAIL="$2" 239 SHIFT_COUNT=1 240 ;; 241 '--prefix-run') 242 PREFIX_RUN="$2" 243 SHIFT_COUNT=1 244 ;; 245 '--prefix-spool') 246 PREFIX_SPOOL="$2" 182 247 SHIFT_COUNT=1 183 248 ;; … … 190 255 PREFIX_BIN=$(echo "$1" | cut -d= -f2) 191 256 ;; 257 '--prefix-sbin='*) 258 PREFIX_SBIN=$(echo "$1" | cut -d= -f2) 259 ;; 192 260 '--prefix-lib='*) 193 261 PREFIX_LIB=$(echo "$1" | cut -d= -f2) … … 204 272 '--prefix-ckport='*) 205 273 PREFIX_CKPORT=$(echo "$1" | cut -d= -f2) 274 ;; 275 '--prefix-sysconf='*) 276 PREFIX_SYSCONF=$(echo "$1" | cut -d= -f2) 277 ;; 278 '--prefix-dev='*) 279 PREFIX_DEV=$(echo "$1" | cut -d= -f2) 280 ;; 281 '--prefix-doc='*) 282 PREFIX_DOC=$(echo "$1" | cut -d= -f2) 283 ;; 284 '--prefix-tmp='*) 285 PREFIX_TMP=$(echo "$1" | cut -d= -f2) 286 ;; 287 '--prefix-var='*) 288 PREFIX_VAR=$(echo "$1" | cut -d= -f2) 289 ;; 290 '--prefix-cache='*) 291 PREFIX_CACHE=$(echo "$1" | cut -d= -f2) 292 ;; 293 '--prefix-data='*) 294 PREFIX_DATA=$(echo "$1" | cut -d= -f2) 295 ;; 296 '--prefix-lock='*) 297 PREFIX_LOCK=$(echo "$1" | cut -d= -f2) 298 ;; 299 '--prefix-log='*) 300 PREFIX_LOG=$(echo "$1" | cut -d= -f2) 301 ;; 302 '--prefix-mail='*) 303 PREFIX_MAIL=$(echo "$1" | cut -d= -f2) 304 ;; 305 '--prefix-run='*) 306 PREFIX_RUN=$(echo "$1" | cut -d= -f2) 307 ;; 308 '--prefix-spool='*) 309 PREFIX_SPOOL=$(echo "$1" | cut -d= -f2) 206 310 ;; 207 311 #################################### … … 276 380 update_prefixes() { 277 381 [ "$PREFIX_BIN" = '' ] && PREFIX_BIN="$PREFIX/bin/" 382 [ "$PREFIX_SBIN" = '' ] && PREFIX_SBIN="$PREFIX/sbin/" 278 383 [ "$PREFIX_LIB" = '' ] && PREFIX_LIB="$PREFIX/lib/" 279 384 [ "$PREFIX_INC" = '' ] && PREFIX_INC="$PREFIX/include/" … … 281 386 [ "$PREFIX_PC" = '' ] && PREFIX_PC="$PREFIX_LIB/pkgconfig/" 282 387 [ "$PREFIX_CKPORT" = '' ] && PREFIX_CKPORT="$PREFIX_LIB/ckport/db/" 388 [ "$PREFIX_SYSCONF" = '' ] && PREFIX_SYSCONF="$PREFIX/etc/" 389 [ "$PREFIX_DEV" = '' ] && PREFIX_DEV="$PREFIX/dev/" 390 [ "$PREFIX_DOC" = '' ] && PREFIX_DOC="$PREFIX/share/doc/" 391 [ "$PREFIX_TMP" = '' ] && PREFIX_TMP="$PREFIX/tmp/" 392 [ "$PREFIX_VAR" = '' ] && PREFIX_VAR="$PREFIX/var/" 393 [ "$PREFIX_CACHE" = '' ] && PREFIX_CACHE="$PREFIX_VAR/cache/" 394 [ "$PREFIX_DATA" = '' ] && PREFIX_DATA="$PREFIX_VAR/lib/" 395 [ "$PREFIX_LOCK" = '' ] && PREFIX_LOCK="$PREFIX_VAR/lock/" 396 [ "$PREFIX_LOG" = '' ] && PREFIX_LOG="$PREFIX_VAR/log/" 397 [ "$PREFIX_MAIL" = '' ] && PREFIX_MAIL="$PREFIX_VAR/mail/" 398 [ "$PREFIX_RUN" = '' ] && PREFIX_RUN="$PREFIX_VAR/run/" 399 [ "$PREFIX_SPOOL" = '' ] && PREFIX_SPOOL="$PREFIX_VAR/spool/" 283 400 } 284 401 … … 331 448 echo "PREFIX=$PREFIX" 332 449 echo "PREFIX_BIN=$PREFIX_BIN" 450 echo "PREFIX_SBIN=$PREFIX_SBIN" 333 451 echo "PREFIX_LIB=$PREFIX_LIB" 334 452 echo "PREFIX_INC=$PREFIX_INC" … … 336 454 echo "PREFIX_PC=$PREFIX_PC" 337 455 echo "PREFIX_CKPORT=$PREFIX_CKPORT" 456 echo "PREFIX_SYSCONF=$PREFIX_SYSCONF" 457 echo "PREFIX_DEV=$PREFIX_DEV" 458 echo "PREFIX_DOC=$PREFIX_DOC" 459 echo "PREFIX_TMP=$PREFIX_TMP" 460 echo "PREFIX_VAR=$PREFIX_VAR" 461 echo "PREFIX_CACHE=$PREFIX_CACHE" 462 echo "PREFIX_DATA=$PREFIX_DATA" 463 echo "PREFIX_LOCK=$PREFIX_LOCK" 464 echo "PREFIX_LOG=$PREFIX_LOG" 465 echo "PREFIX_MAIL=$PREFIX_MAIL" 466 echo "PREFIX_RUN=$PREFIX_RUN" 467 echo "PREFIX_SPOOL=$PREFIX_SPOOL" 338 468 echo 339 469 } >&4 -
build-system/configure.vars
r5808 r5810 59 59 PREFIX='/usr/local' 60 60 PREFIX_BIN='' 61 PREFIX_SBIN='' 61 62 PREFIX_LIB='' 62 63 PREFIX_INC='' … … 64 65 PREFIX_PC='' 65 66 PREFIX_CKPORT='' 67 PREFIX_SYSCONF='' 68 PREFIX_DEV='' 69 PREFIX_DOC='' 70 PREFIX_TMP='' 71 PREFIX_VAR='' 72 PREFIX_CACHE='' 73 PREFIX_DATA='' 74 PREFIX_LOCK='' 75 PREFIX_LOG='' 76 PREFIX_MAIL='' 77 PREFIX_RUN='' 78 PREFIX_SPOOL='' 66 79 67 80 ROOT_UID='' -
configure
r5803 r5810 538 538 echo "#define ROAR_PREFIX \"$PREFIX\"" 539 539 echo "#define ROAR_PREFIX_BIN \"$PREFIX_BIN\"" 540 echo "#define ROAR_PREFIX_SBIN \"$PREFIX_SBIN\"" 540 541 echo "#define ROAR_PREFIX_LIB \"$PREFIX_LIB\"" 541 542 echo "#define ROAR_PREFIX_INC \"$PREFIX_INC\"" … … 543 544 echo "#define ROAR_PREFIX_PC \"$PREFIX_PC\"" 544 545 echo "#define ROAR_PREFIX_CKPORT \"$PREFIX_CKPORT\"" 546 echo "#define ROAR_PREFIX_SYSCONF \"$PREFIX_SYSCONF\"" 547 echo "#define ROAR_PREFIX_DEV \"$PREFIX_DEV\"" 548 echo "#define ROAR_PREFIX_DOC \"$PREFIX_DOC\"" 549 echo "#define ROAR_PREFIX_TMP \"$PREFIX_TMP\"" 550 echo "#define ROAR_PREFIX_VAR \"$PREFIX_VAR\"" 551 echo "#define ROAR_PREFIX_CACHE \"$PREFIX_CACHE\"" 552 echo "#define ROAR_PREFIX_DATA \"$PREFIX_DATA\"" 553 echo "#define ROAR_PREFIX_LOCK \"$PREFIX_LOCK\"" 554 echo "#define ROAR_PREFIX_LOG \"$PREFIX_LOG\"" 555 echo "#define ROAR_PREFIX_MAIL \"$PREFIX_MAIL\"" 556 echo "#define ROAR_PREFIX_RUN \"$PREFIX_RUN\"" 557 echo "#define ROAR_PREFIX_SPOOL \"$PREFIX_SPOOL\"" 545 558 echo "#define ROAR_PREFIX_COMP_LIBS \"$PREFIX_COMP_LIBS\"" 546 559 echo "#define ROAR_PREFIX_COMP_BINS \"$PREFIX_COMP_BINS\"" -
libroar/config.c
r5791 r5810 439 439 const char * name; 440 440 const char * path; 441 const int with_product; 441 const int with_product; // 0 = no, 1 = yes, 2 = just product. 442 442 const int with_provider; 443 443 } __paths[] = { 444 444 {"prefix", ROAR_PREFIX, 0, 0}, 445 445 {"prefix-bin", ROAR_PREFIX_BIN, 0, 0}, 446 {"prefix-sbin", ROAR_PREFIX_SBIN, 0, 0}, 446 447 {"prefix-lib", ROAR_PREFIX_LIB, 0, 0}, 447 448 {"prefix-inc", ROAR_PREFIX_INC, 0, 0}, 448 449 {"prefix-man", ROAR_PREFIX_MAN, 0, 0}, 449 {"prefix-pc", ROAR_PREFIX_PC, 0, 0}, 450 {"prefix-ckport", ROAR_PREFIX_CKPORT, 0, 0}, 451 {"prefix-comp-libs", ROAR_PREFIX_COMP_LIBS, 0, 0}, 452 {"prefix-comp-bins", ROAR_PREFIX_COMP_BINS, 0, 0}, 453 {"prefix-plugins", ROAR_PREFIX_PLUGINS, 1, 1}, 450 {"prefix-man1", ROAR_PREFIX_MAN "/man1", 0, 0}, 451 {"prefix-man2", ROAR_PREFIX_MAN "/man2", 0, 0}, 452 {"prefix-man3", ROAR_PREFIX_MAN "/man3", 0, 0}, 453 {"prefix-man4", ROAR_PREFIX_MAN "/man4", 0, 0}, 454 {"prefix-man5", ROAR_PREFIX_MAN "/man5", 0, 0}, 455 {"prefix-man6", ROAR_PREFIX_MAN "/man6", 0, 0}, 456 {"prefix-man7", ROAR_PREFIX_MAN "/man7", 0, 0}, 457 {"prefix-man8", ROAR_PREFIX_MAN "/man8", 0, 0}, 458 {"prefix-man9", ROAR_PREFIX_MAN "/man9", 0, 0}, 459 {"prefix-pc", ROAR_PREFIX_PC, 0, 0}, 460 {"prefix-ckport", ROAR_PREFIX_CKPORT, 0, 0}, 461 {"prefix-sysconf", ROAR_PREFIX_SYSCONF, 0, 0}, 462 {"prefix-dev", ROAR_PREFIX_DEV, 0, 0}, 463 {"prefix-doc", ROAR_PREFIX_DOC, 2, 0}, 464 {"prefix-tmp", ROAR_PREFIX_TMP, 0, 0}, 465 {"prefix-var", ROAR_PREFIX_VAR, 0, 0}, 466 {"prefix-cache", ROAR_PREFIX_CACHE, 2, 0}, 467 {"prefix-data", ROAR_PREFIX_DATA, 2, 0}, 468 {"prefix-lock", ROAR_PREFIX_LOCK, 0, 0}, 469 {"prefix-log", ROAR_PREFIX_LOG, 0, 0}, 470 {"prefix-mail", ROAR_PREFIX_MAIL, 0, 0}, 471 {"prefix-run", ROAR_PREFIX_RUN, 0, 0}, 472 {"prefix-spool", ROAR_PREFIX_SPOOL, 2, 0}, 473 {"prefix-comp-libs", ROAR_PREFIX_COMP_LIBS, 0, 0}, 474 {"prefix-comp-bins", ROAR_PREFIX_COMP_BINS, 0, 0}, 475 {"prefix-plugins", ROAR_PREFIX_PLUGINS, 1, 1}, 454 476 {"prefix-buildsystem", ROAR_PREFIX_BUILDSYSTEM, 0, 0} 455 477 }; 456 478 457 static int __product2path(char * path, size_t pathlen, int null_as_universal, const char * product ) {479 static int __product2path(char * path, size_t pathlen, int null_as_universal, const char * product, int type) { 458 480 const char * c; 459 481 const char * e; … … 463 485 if ( product == NULL ) { 464 486 if ( null_as_universal ) { 465 snprintf(path, pathlen, "/universal/universal"); 487 if ( type == 2 ) { 488 snprintf(path, pathlen, "/universal"); 489 } else { 490 snprintf(path, pathlen, "/universal/universal"); 491 } 466 492 } else { 467 493 path[0] = 0; … … 483 509 s = strstr(c, "/"); 484 510 485 if ( s == NULL ) { 511 if ( type == 2 ) { 512 snprintf(path, pathlen, "/%.*s", (int)(size_t)(b-product), product); 513 } else if ( s == NULL ) { 486 514 snprintf(path, pathlen, "/unreg-%.*s/%.*s", (int)(size_t)(e-c), c, (int)(size_t)(b-product), product); 487 515 } else { … … 548 576 } 549 577 550 if ( __product2path(buf_product, sizeof(buf_product), null_as_universal, product ) == -1 )578 if ( __product2path(buf_product, sizeof(buf_product), null_as_universal, product, __paths[i].with_product) == -1 ) 551 579 return NULL; 552 580 -
roarclients/roar-config.c
r5790 r5810 135 135 char * path = roar_libroar_get_path(name, null_as_universal, product, provider); 136 136 if ( path == NULL ) { 137 fprintf(stderr, " Unknown path: %s\n", name);137 fprintf(stderr, "Error: Can not get path: %s: %s\n", name, roar_errorstring); 138 138 return; 139 139 }
Note: See TracChangeset
for help on using the changeset viewer.