+ Added a --libdir switch to the configure and build

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@866 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/Makefile b/Makefile
index 2a062c8f1ce4ee00ae39cb0d3abfa0e51fc65cb2..3723d72781fa12f1aaf84fc386e6a1f9c9ff0a46 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-include config.mak
-
 SUBDIRS = src/framework \
                  src/inigo \
                  src/valerie \
@@ -23,14 +21,16 @@ dist-clean:
        done; \
        rm config.mak;
 
+include config.mak
+
 install:
        install -d "$(DESTDIR)$(prefix)/bin"
        install -d "$(DESTDIR)$(prefix)/include"
-       install -d "$(DESTDIR)$(prefix)/lib"
-       install -d "$(DESTDIR)$(prefix)/lib/pkgconfig"
+       install -d "$(DESTDIR)$(libdir)"
+       install -d "$(DESTDIR)$(libdir)/pkgconfig"
        install -d "$(DESTDIR)$(prefix)/share/mlt/modules"
        install -c -m 755 mlt-config "$(DESTDIR)$(bindir)"
-       install -c -m 644 *.pc "$(DESTDIR)$(prefix)/lib/pkgconfig"
+       install -c -m 644 *.pc "$(DESTDIR)$(libdir)/pkgconfig"
        install -m 644 packages.dat "$(DESTDIR)$(prefix)/share/mlt/"
        list='$(SUBDIRS)'; \
        for subdir in $$list; do \

diff --git a/configure b/configure
index ba046e9959a5110e4be734df055e0e168cbe06a7..948fb5954193f7c4c12af9805d3a26305fa91132 100755 (executable)
--- a/configure
+++ b/configure
@@ -12,6 +12,7 @@ Help options:
 General build options:
 
   --prefix=directory      - install prefix for path (default: $prefix)
+  --libdir=directory      - lib directory (default: $prefix/lib)
   --enable-gpl            - Enable GPL components
   --enable-motion-est    - Enable motion estimation components
   --disable-debug         - Compile without debug support (default: on)
@@ -38,6 +39,7 @@ function build_config
        (
                echo "version=$version"
                echo "prefix=$prefix"
+               echo "libdir=$libdir"
                echo "bindir=$prefix/bin"
                echo "targetos=$targetos"
 
@@ -79,6 +81,7 @@ function build_config
        (
                echo export version=$version
                echo export prefix=$prefix
+               echo export libdir=$libdir
                echo export bindir=$prefix/bin
        ) >> mlt-config
 
@@ -93,7 +96,7 @@ function build_pkgconfig
        do
                echo "prefix=$prefix" >mlt-$i.pc
                echo "exec_prefix=$prefix" >>mlt-$i.pc
-               echo "libdir=$prefix/lib" >>mlt-$i.pc
+               echo "libdir=$libdir" >>mlt-$i.pc
                echo "includedir=$prefix/include" >>mlt-$i.pc
                echo "version=$version" >>mlt-$i.pc
                echo "cflags=`grep ^$i packages.dat | cut -f 2`" >>mlt-$i.pc
@@ -108,6 +111,7 @@ set +x
 # Define build directory for scripts called
 export build_dir=`dirname $0`
 export prefix=/usr/local
+export libdir=""
 export help=0
 export version=0.1.1
 export debug=true
@@ -139,6 +143,7 @@ do
        case $i in
                --help )                        help=1 ;;
                --prefix=* )            prefix="${i#--prefix=}" ;;
+               --libdir=* )            libdir="${i#--libdir=}" ;;
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false ;;
                --enable-gpl )          gpl=true ;;
@@ -147,6 +152,10 @@ do
        esac
 done
 
+# Determine the libdir if it's not specified in the args
+[ "$libdir" = "" ] && libdir=$prefix/lib
+echo $libdir
+
 # Double check mmx (may end up disabling mmx on non-linux platforms incorrectly)
 if [ "$mmx" = "true" ]
 then

diff --git a/src/framework/Makefile b/src/framework/Makefile
index 4827df18ca860dc18b21dbf3b2eea0d0fb9ac68a..bc6fdcfc5b851fbaccccc226d8333fe008de9954 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -67,7 +67,8 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install:
-       install -m 755 $(TARGET) $(DESTDIR)$(prefix)/lib/libmlt$(LIBSUF)
+       install -d $(DESTDIR)$(libdir)
+       install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libmlt$(LIBSUF)
        install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"
 

diff --git a/src/miracle/Makefile b/src/miracle/Makefile
index b3ee7758286c3ade793150d6ed69a74c87444bf9..0329affb87258014b87b6f54a5f77e3fcc7a4afd 100644 (file)
--- a/src/miracle/Makefile
+++ b/src/miracle/Makefile
@@ -44,7 +44,7 @@ clean:
 install:       all
        install -d "$(DESTDIR)$(bindir)"
        install -c -s -m 755 $(TARGET) "$(DESTDIR)$(bindir)"
-       install -m 755 libmiracle$(LIBSUF) $(DESTDIR)$(prefix)/lib/libmiracle$(LIBSUF)
+       install -m 755 libmiracle$(LIBSUF) $(DESTDIR)$(libdir)/libmiracle$(LIBSUF)
        mkdir -p "$(DESTDIR)$(prefix)/include/mlt/miracle"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/miracle"
 

diff --git a/src/valerie/Makefile b/src/valerie/Makefile
index aceb8f00b3c05299bc09cc53f87898d7393aa540..64c2fc11009349f258b26b29720a546e17a44404 100644 (file)
--- a/src/valerie/Makefile
+++ b/src/valerie/Makefile
@@ -42,7 +42,7 @@ clean:
                rm -f $(OBJS) $(TARGET)
 
 install:       all
-       install -m 755 $(TARGET) $(DESTDIR)$(prefix)/lib/libvalerie$(LIBSUF)
+       install -m 755 $(TARGET) $(DESTDIR)$(libdir)/libvalerie$(LIBSUF)
        mkdir -p "$(DESTDIR)$(prefix)/include/mlt/valerie"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/valerie"