accept the standard --prefix etc. options

git-svn-id: svn://svn.videolan.org/x264/trunk@243 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/Makefile b/Makefile
index ec3f3dcb5fcc2d52f7eada2ba9487018bf374488..c030cbdc733b113a7cdb4ae560bd4f6637c6306d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -78,12 +78,11 @@ clean:
 distclean: clean
        rm -f config.mak vfw/build/cygwin/config.mak
 
-DIR_INSTALL="/usr/local"
 install: x264
-       install -d $(DIR_INSTALL)/include $(DIR_INSTALL)/lib $(DIR_INSTALL)/bin
-       install x264.h $(DIR_INSTALL)/include/
-       install libx264.a $(DIR_INSTALL)/lib/
-       install x264 $(DIR_INSTALL)/bin/
+       install -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+       install -m 644 x264.h $(DESTDIR)$(includedir)
+       install -m 644 libx264.a $(DESTDIR)$(libdir)
+       install x264 $(DESTDIR)$(bindir)
 
 etags: TAGS
 

diff --git a/configure b/configure
index 2e0ed92b8d739074cd805dcee04e5c4f896dbc46..7e899f7e472be1c9396a7e2c6e17d83a112e8620 100755 (executable)
--- a/configure
+++ b/configure
@@ -19,6 +19,12 @@ echo ""
 exit 1
 fi
 
+prefix='/usr/local'
+eprefix='${prefix}'
+bindir='${eprefix}/bin'
+libdir='${eprefix}/lib'
+includedir='${prefix}/include'
+
 avis_input="no"
 mp4_output="no"
 pthread="no"
@@ -105,7 +111,23 @@ CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
 # parse options
 
 for opt do
+    optarg="${opt#*=}"
     case "$opt" in
+       --prefix=*)
+           prefix="$optarg"
+           ;;
+       --exec-prefix=*)
+           eprefix="$optarg"
+           ;;
+       --bindir=*)
+           bindir="$optarg"
+           ;;
+       --libdir=*)
+           libdir="$optarg"
+           ;;
+       --includedir=*)
+           includedir="$optarg"
+           ;;
         --enable-avis-input)
             if [ $SYS = CYGWIN -o $SYS = MINGW ]; then
                 CFLAGS="$CFLAGS -DAVIS_INPUT"
@@ -170,6 +192,11 @@ fi
 
 rm -f config.mak
 cat > config.mak << EOF
+prefix=$prefix
+eprefix=$eprefix
+bindir=$bindir
+libdir=$libdir
+includedir=$includedir
 ARCH=$ARCH
 SYS=$SYS
 CC=$CC