Changeset 5869:f59dda501383 in roaraudio

Timestamp:

01/24/13 13:18:51 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Corrected default paths (Closes: #345) (pr1)

Location:

build-system

Files:

• configure.lib (modified) (2 diffs)
• configure.vars (modified) (1 diff)

build-system/configure.lib

@@ -67 +67 @@
  echo '--prefix-man DIR            - Set prefix for manpages (default: $PREFIX/share/man)'
  echo '--prefix-pc DIR             - Set prefix for pkg-config (default: $PREFIX_LIB/pkgconfig)'
- echo '--prefix-sysconf DIR        - Set prefix for system configuration (default: $PREFIX/etc)'
- echo '--prefix-dev DIR            - Set prefix for devices (default: $PREFIX/dev)'
+ echo '--prefix-sysconf DIR        - Set prefix for system configuration (default: '"$PREFIX_SYSCONF"')'
+ echo '--prefix-dev DIR            - Set prefix for devices (default: '"$PREFIX_DEV"')'
  echo '--prefix-doc DIR            - Set prefix for documentation (default: $PREFIX/share/doc)'
- echo '--prefix-tmp DIR            - Set prefix for temporary files (default: $PREFIX/tmp)'
- echo '--prefix-var DIR            - Set prefix for variable files (default: $PREFIX/var)'
+ echo '--prefix-tmp DIR            - Set prefix for temporary files (default: '"$PREFIX_TMP"')'
+ echo '--prefix-var DIR            - Set prefix for variable files (default: '"$PREFIX_VAR"')'
  echo '--prefix-cache DIR          - Set prefix for application caches (default: $PREFIX_VAR/cache)'
  echo '--prefix-data DIR           - Set prefix for variable application data (default: $PREFIX_VAR/lib)'
@@ -407 +407 @@
  [ "$PREFIX_PC"     = '' ] && PREFIX_PC="$PREFIX_LIB/pkgconfig/"
  [ "$PREFIX_CKPORT" = '' ] && PREFIX_CKPORT="$PREFIX_LIB/ckport/db/"
- [ "$PREFIX_SYSCONF" = '' ] && PREFIX_SYSCONF="$PREFIX/etc/"
- [ "$PREFIX_DEV"    = '' ] && PREFIX_DEV="$PREFIX/dev/"
+ [ "$PREFIX_SYSCONF" = '' ] && PREFIX_SYSCONF="/etc/"
+ [ "$PREFIX_DEV"    = '' ] && PREFIX_DEV="/dev/"
  [ "$PREFIX_DOC"    = '' ] && PREFIX_DOC="$PREFIX/share/doc/"
- [ "$PREFIX_TMP"    = '' ] && PREFIX_TMP="$PREFIX/tmp/"
- [ "$PREFIX_VAR"    = '' ] && PREFIX_VAR="$PREFIX/var/"
+ [ "$PREFIX_TMP"    = '' ] && PREFIX_TMP="/tmp/"
+ [ "$PREFIX_VAR"    = '' ] && PREFIX_VAR="/var/"
  [ "$PREFIX_CACHE"  = '' ] && PREFIX_CACHE="$PREFIX_VAR/cache/"
  [ "$PREFIX_DATA"   = '' ] && PREFIX_DATA="$PREFIX_VAR/lib/"

build-system/configure.vars

@@ -66 +66 @@
 PREFIX_PC=''
 PREFIX_CKPORT=''
-PREFIX_SYSCONF=''
-PREFIX_DEV=''
+PREFIX_SYSCONF='/etc'
+PREFIX_DEV='/dev'
 PREFIX_DOC=''
-PREFIX_TMP=''
-PREFIX_VAR=''
+PREFIX_TMP='/tmp'
+PREFIX_VAR='/var'
 PREFIX_CACHE=''
 PREFIX_DATA=''