Add datadir and mandir options to configure.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

diff --git a/configure b/configure
index a80d2f76e75b0bcd1e57dee0da59c3b68704f8ed..9eb329bd8732ecc47a8ccd8b389a5c6495fd9226 100755 (executable)
--- a/configure
+++ b/configure
@@ -16,6 +16,8 @@ General build options:
 
   --prefix=directory      - install prefix for path (default: $prefix)
   --libdir=directory      - lib directory (default: $prefix/lib)
+  --datadir=directory     - data directory (default: $prefix/share)
+  --mandir=directory      - man documentation directory (default: $prefix/share/man)
   --enable-gpl            - Enable GPL components
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
@@ -46,6 +48,8 @@ build_config()
                echo "prefix=$prefix"
                echo "libdir=$libdir"
                echo "bindir=$prefix/bin"
+               echo "datadir=$datadir"
+               echo "mandir=$mandir"
                echo "targetos=$targetos"
 
                [ "$mmx" = "true" ] && 
@@ -115,6 +119,8 @@ build_pkgconfig()
                echo exec_prefix=$prefix
                echo libdir=$libdir
                echo includedir=$prefix/include
+               echo datadir=$datadir
+               echo mandir=$mandir
                echo version=$version
                echo cflags=`grep ^framework packages.dat | cut -f 2`
                echo libs=`grep ^framework packages.dat | cut -f 3`
@@ -126,6 +132,8 @@ build_pkgconfig()
                echo exec_prefix=$prefix
                echo libdir=$libdir
                echo includedir=$prefix/include
+               echo datadir=$datadir
+               echo mandir=$mandir
                echo version=$version
                echo cflags=`grep ^mlt++ packages.dat | cut -f 2`
                echo libs=`grep ^mlt++ packages.dat | cut -f 3`
@@ -140,6 +148,8 @@ set +x
 export build_dir=`dirname $0`
 export prefix=/usr/local
 export libdir=""
+export datadir=""
+export mandir=""
 export help=0
 export debug=true
 export mmx=true
@@ -172,6 +182,8 @@ do
                --help )                        help=1 ;;
                --prefix=* )            prefix="${i#--prefix=}" ;;
                --libdir=* )            libdir="${i#--libdir=}" ;;
+               --datadir=* )           datadir="${i#--datadir=}" ;;
+               --mandir=* )            mandir="${i#--mandir=}" ;;
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false; sse=false ;;
                --disable-sse )         sse=false ;;
@@ -183,6 +195,8 @@ done
 
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
+[ "$datadir" = "" ] && datadir=$prefix/share
+[ "$mandir" = "" ] && mandir=$prefix/share/man
 
 # Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]

diff --git a/profiles/Makefile b/profiles/Makefile
index 9ad9f62cf09f3bd6b546b01b08e828d11a4f9fcb..4e07644d603feb4cec3af110b064bb12d13675a9 100644 (file)
--- a/profiles/Makefile
+++ b/profiles/Makefile
@@ -9,10 +9,10 @@ distclean:
 clean:
 
 install:       all uninstall
-       install -d "$(DESTDIR)$(prefix)/share/mlt/profiles"
-       install -m 644 * "$(DESTDIR)$(prefix)/share/mlt/profiles"
-       rm -f "$(DESTDIR)$(prefix)/share/mlt/profiles/"*~
-       rm -f "$(DESTDIR)$(prefix)/share/mlt/profiles/Makefile"
+       install -d "$(DESTDIR)$(datadir)/mlt/profiles"
+       install -m 644 * "$(DESTDIR)$(datadir)/mlt/profiles"
+       rm -f "$(DESTDIR)$(datadir)/mlt/profiles/"*~
+       rm -f "$(DESTDIR)$(datadir)/mlt/profiles/Makefile"
 
 uninstall:
-       rm -rf "$(DESTDIR)$(prefix)/share/mlt/profiles"
+       rm -rf "$(DESTDIR)$(datadir)/mlt/profiles"

diff --git a/src/framework/Makefile b/src/framework/Makefile
index e84caa687b55408576be1b87c82e309a744b578b..fa95884a3c1799d0be864c78c2d3cbc356ce248d 100644 (file)
--- a/src/framework/Makefile
+++ b/src/framework/Makefile
@@ -94,15 +94,15 @@ install:
        ln -sf $(TARGET) $(DESTDIR)$(libdir)/$(NAME)
        install -d "$(DESTDIR)$(prefix)/include/mlt/framework"
        install -m 644 $(INCS) "$(DESTDIR)$(prefix)/include/mlt/framework"
-       install -d "$(DESTDIR)$(prefix)/share/mlt"
-       install -m 644 metaschema.yaml "$(DESTDIR)$(prefix)/share/mlt/"
+       install -d "$(DESTDIR)$(datadir)/mlt"
+       install -m 644 metaschema.yaml "$(DESTDIR)$(datadir)/mlt/"
 
 uninstall:
        rm -f "$(DESTDIR)$(libdir)/$(TARGET)"
        rm -f "$(DESTDIR)$(libdir)/$(SONAME)"
        rm -f "$(DESTDIR)$(libdir)/$(NAME)"
        rm -rf "$(DESTDIR)$(prefix)/include/mlt/framework"
-       rm "$(DESTDIR)$(prefix)/share/mlt/metaschema.yaml"
+       rm "$(DESTDIR)$(datadir)/mlt/metaschema.yaml"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/melt/Makefile b/src/melt/Makefile
index 239bb393a298046afad2372017514f168173dd6c..61e16ff837e8d00d62ed2e8f7c9d371cdcdde27a 100644 (file)
--- a/src/melt/Makefile
+++ b/src/melt/Makefile
@@ -1,6 +1,6 @@
 include ../../config.mak
 
-TARGET = melt
+TARGET = mlt
 
 OBJS = melt.o \
           io.o
@@ -15,6 +15,7 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
                $(CC) -o $@ $(OBJS) $(LDFLAGS)
+               ln -sf $@ melt
 
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 4a8ff3a0866ead5d95c6b40e2d42006d603604d1..976f59513db5211ae136523a7d71d0b2a57bb2ab 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -73,13 +73,13 @@ clean:
 
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(prefix)/share/mlt/avformat"
-       install -m 644 producer_avformat.yml "$(DESTDIR)$(prefix)/share/mlt/avformat"
+       install -d "$(DESTDIR)$(datadir)/mlt/avformat"
+       install -m 644 producer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat"
 
 uninstall:
        rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)" 2> /dev/null || true
        rm "$(DESTDIR)$(libdir)/mlt/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
-       rm -rf "$(DESTDIR)$(prefix)/share/mlt/avformat"
+       rm -rf "$(DESTDIR)$(datadir)/mlt/avformat"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index 4419568db67f64fbca44901ed36492dc97bdb47b..3572821a9bbee715f4c1a4210417dcd66d4893c4 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -59,9 +59,9 @@ clean:
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
        install -d "$(DESTDIR)$(prefix)/share/mlt/core"
-       install -m 644 data_fx.properties "$(DESTDIR)$(prefix)/share/mlt/core"
-       install -m 644 loader.dict "$(DESTDIR)$(prefix)/share/mlt/core"
-       install -m 644 loader.ini "$(DESTDIR)$(prefix)/share/mlt/core"
+       install -m 644 data_fx.properties "$(DESTDIR)$(datadir)/mlt/core"
+       install -m 644 loader.dict "$(DESTDIR)$(datadir)/mlt/core"
+       install -m 644 loader.ini "$(DESTDIR)$(datadir)/mlt/core"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/modules/feeds/Makefile b/src/modules/feeds/Makefile
index 706a6939be04186f4781162d04b9e843fe0bddf4..2388dc1e185e6be526059f4f1d70fa743cb066b8 100644 (file)
--- a/src/modules/feeds/Makefile
+++ b/src/modules/feeds/Makefile
@@ -9,7 +9,7 @@ distclean:
 clean:
 
 install:       all
-       install -d "$(DESTDIR)$(prefix)/share/mlt/feeds/PAL"
-       install -d "$(DESTDIR)$(prefix)/share/mlt/feeds/NTSC"
-       install -m 644 PAL/*.* "$(DESTDIR)$(prefix)/share/mlt/feeds/PAL"
-       install -m 644 NTSC/*.* "$(DESTDIR)$(prefix)/share/mlt/feeds/NTSC"
+       install -d "$(DESTDIR)$(datadir)/mlt/feeds/PAL"
+       install -d "$(DESTDIR)$(datadir)/mlt/feeds/NTSC"
+       install -m 644 PAL/*.* "$(DESTDIR)$(datadir)/mlt/feeds/PAL"
+       install -m 644 NTSC/*.* "$(DESTDIR)$(datadir)/mlt/feeds/NTSC"

diff --git a/src/modules/lumas/Makefile b/src/modules/lumas/Makefile
index 14079e0914fe6b968ec044be69581426767455fc..34b1c5ae3199e7f1c2197ecae09711e6dd1169ec 100644 (file)
--- a/src/modules/lumas/Makefile
+++ b/src/modules/lumas/Makefile
@@ -17,7 +17,7 @@ clean:
        rm -f luma 
 
 install:       all
-       install -d $(DESTDIR)$(prefix)/share/mlt/lumas/PAL
-       install -d $(DESTDIR)$(prefix)/share/mlt/lumas/NTSC
-       install -m 644 PAL/* $(DESTDIR)$(prefix)/share/mlt/lumas/PAL
-       install -m 644 NTSC/* $(DESTDIR)$(prefix)/share/mlt/lumas/NTSC
+       install -d $(DESTDIR)$(datadir)/mlt/lumas/PAL
+       install -d $(DESTDIR)$(datadir)/mlt/lumas/NTSC
+       install -m 644 PAL/* $(DESTDIR)$(datadir)/mlt/lumas/PAL
+       install -m 644 NTSC/* $(DESTDIR)$(datadir)/mlt/lumas/NTSC

diff --git a/src/modules/oldfilm/Makefile b/src/modules/oldfilm/Makefile
index 90c13c335218b2731cf123f73fbc5e49c34f85b6..50038ab491eb16536ee4d40e30e29acaa749b9c2 100644 (file)
--- a/src/modules/oldfilm/Makefile
+++ b/src/modules/oldfilm/Makefile
@@ -33,9 +33,9 @@ clean:
 
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d $(DESTDIR)$(prefix)/share/mlt/oldfilm
-       install -m 644 *.svg "$(DESTDIR)$(prefix)/share/mlt/oldfilm"
-       install -m 644 *.yml "$(DESTDIR)$(prefix)/share/mlt/oldfilm"
+       install -d $(DESTDIR)$(datadir)/mlt/oldfilm
+       install -m 644 *.svg "$(DESTDIR)$(datadir)/mlt/oldfilm"
+       install -m 644 *.yml "$(DESTDIR)$(datadir)/mlt/oldfilm"
 
 
 ifneq ($(wildcard .depend),)

diff --git a/src/modules/xml/Makefile b/src/modules/xml/Makefile
index 617c90d21bb39573261b0eb559561d5ab6a0e0d9..83c617b58afebdd99c603a73c5870dd5140a4b9f 100644 (file)
--- a/src/modules/xml/Makefile
+++ b/src/modules/xml/Makefile
@@ -30,8 +30,8 @@ clean:
 
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(prefix)/share/mlt/xml"
-       install -m 644 mlt-xml.dtd "$(DESTDIR)$(prefix)/share/mlt/xml"
+       install -d "$(DESTDIR)$(datadir)/mlt/xml"
+       install -m 644 mlt-xml.dtd "$(DESTDIR)$(datadir)/mlt/xml"
 
 ifneq ($(wildcard .depend),)
 include .depend