Changeset 5787:bff6c671917e in roaraudio

Timestamp:

12/03/12 14:54:58 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to handle ckport databases

Location:

build-system

Files:

• Makefile.install (modified) (4 diffs)
• Makefile.library (modified) (1 diff)
• configure.lib (modified) (4 diffs)
• configure.vars (modified) (1 diff)

build-system/Makefile.install

@@ -40 +40 @@
         mkdir -p '$(DESTDIR)$(PREFIX_PC)'
         mkdir -p '$(DESTDIR)$(PREFIX_MAN)'/man3/
+        mkdir -p '$(DESTDIR)$(PREFIX_CKPORT)'
 
 prep-install-bin: all prep-install-dirs-bin
@@ -54 +55 @@
         cp $(cp_v) $(TARGETS)   '$(DESTDIR)$(PREFIX_LIB)'
         cp $(cp_v) $(PCLIBNAME) '$(DESTDIR)$(PREFIX_PC)'
+        cp $(cp_v) $(CKPORTDB)  '$(DESTDIR)$(PREFIX_CKPORT)'
         sh -c 'set -e; for file in $(HEADERS);    do cp $(cp_v) $(HEADERS_DIR)/$$file '$(DESTDIR)$(PREFIX_INC)'/'$(HEADER_PREFIX)'; done'
         sh -c 'set -e; for file in $(MANPAGE_3);  do cp $(cp_v) $$file '$(DESTDIR)$(PREFIX_MAN)'/man3/; done'
@@ -67 +69 @@
         sh -c 'set -e; for file in $(TARGETS);    do ln -fs `pwd`/$$file '$(DESTDIR)$(PREFIX_LIB)'/; done'
         ln -fs `pwd`/$(PCLIBNAME)  '$(DESTDIR)$(PREFIX_PC)'
+        ln -fs `pwd`/$(CKPORTDB)   '$(DESTDIR)$(PREFIX_CKPORT)'
         sh -c 'set -e; for file in $(HEADERS);    do ln -fs `pwd`/$(HEADERS_DIR)/$$file '$(DESTDIR)$(PREFIX_INC)'/'$(HEADER_PREFIX)'; done'
         sh -c 'set -e; for file in $(MANPAGE_3);  do ln -fs `pwd`/$$file '$(DESTDIR)$(PREFIX_MAN)'/man3/; done'
@@ -79 +82 @@
         sh -c 'set -e; for file in $(TARGETS);    do rm -f '$(DESTDIR)$(PREFIX_LIB)/'$$file; done'
         rm -f '$(DESTDIR)$(PREFIX_PC)/$(PCLIBNAME)'
+        rm -f '$(DESTDIR)$(PREFIX_CKPORT)/$(CKPORTDB)'
         sh -c 'set -e; for file in $(HEADERS);    do rm -f '$(DESTDIR)$(PREFIX_INC)'/'$(HEADER_PREFIX)/'$$file; done'
         sh -c 'set -e; for file in $(MANPAGE_3);  do rm -f '$(DESTDIR)$(PREFIX_MAN)/man3/$$file'; done'

build-system/Makefile.library

@@ -48 +48 @@
 ALIBNAME     = $(LIBNAME).a
 PCLIBNAME    = $(LIBNAME).pc
+CKPORTDB     = $(LIBNAME).ckport
 
 TARGETS=$(SOLIBNAME) $(SOVLIBNAME) $(ALIBNAME) $(PCLIBNAME)

build-system/configure.lib

@@ -171 +171 @@
    SHIFT_COUNT=1
   ;;
+  '--prefix-ckport')
+   PREFIX_CKPORT="$2"
+   SHIFT_COUNT=1
+  ;;
 ####################################
 # autof* options block:
@@ -190 +194 @@
   '--prefix-pc='*)
    PREFIX_PC=$(echo "$1" | cut -d= -f2)
+  ;;
+  '--prefix-ckport='*)
+   PREFIX_CKPORT=$(echo "$1" | cut -d= -f2)
   ;;
 ####################################
@@ -261 +268 @@
 
 update_prefixes() {
- [ "$PREFIX_BIN"  = '' ] && PREFIX_BIN="$PREFIX/bin/"
- [ "$PREFIX_LIB"  = '' ] && PREFIX_LIB="$PREFIX/lib/"
- [ "$PREFIX_INC"  = '' ] && PREFIX_INC="$PREFIX/include/"
- [ "$PREFIX_MAN"  = '' ] && PREFIX_MAN="$PREFIX/share/man/"
- [ "$PREFIX_PC"   = '' ] && PREFIX_PC="$PREFIX_LIB/pkgconfig/"
+ [ "$PREFIX_BIN"    = '' ] && PREFIX_BIN="$PREFIX/bin/"
+ [ "$PREFIX_LIB"    = '' ] && PREFIX_LIB="$PREFIX/lib/"
+ [ "$PREFIX_INC"    = '' ] && PREFIX_INC="$PREFIX/include/"
+ [ "$PREFIX_MAN"    = '' ] && PREFIX_MAN="$PREFIX/share/man/"
+ [ "$PREFIX_PC"     = '' ] && PREFIX_PC="$PREFIX_LIB/pkgconfig/"
+ [ "$PREFIX_CKPORT" = '' ] && PREFIX_CKPORT="$PREFIX_LIB/ckport/db/"
 }
 
@@ -320 +328 @@
   echo "PREFIX_MAN=$PREFIX_MAN"
   echo "PREFIX_PC=$PREFIX_PC"
+  echo "PREFIX_CKPORT=$PREFIX_CKPORT"
   echo
  } >&4

build-system/configure.vars

@@ -63 +63 @@
 PREFIX_MAN=''
 PREFIX_PC=''
+PREFIX_CKPORT=''
 
 ROOT_UID=''