1aecd81d5d
git-svn-id: svn://svn.openwrt.org/openwrt/packages@12979 3c298f89-4303-0410-b956-a3cf2f4a3e73
29 lines
827 B
Diff
29 lines
827 B
Diff
--- a/configure
|
|
+++ b/configure
|
|
@@ -881,11 +881,11 @@ logfile="config.err"
|
|
|
|
# installation paths
|
|
prefix="/usr/local"
|
|
-libdir='$(PREFIX)/lib'
|
|
+libdir='${prefix}/lib'
|
|
shlibdir="$libdir"
|
|
-incdir='$(PREFIX)/include'
|
|
-mandir='$(PREFIX)/share/man'
|
|
-bindir='$(PREFIX)/bin'
|
|
+incdir='${prefix}/include'
|
|
+mandir='${prefix}/share/man'
|
|
+bindir='${prefix}/bin'
|
|
|
|
# toolchain
|
|
cc="gcc"
|
|
@@ -1936,8 +1936,7 @@ echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH
|
|
echo "#define FFMPEG_CONFIG_H" >> $TMPH
|
|
echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
|
|
|
|
-echo "PREFIX=$prefix" >> config.mak
|
|
-echo "prefix=\$(DESTDIR)\$(PREFIX)" >> config.mak
|
|
+echo "prefix=$prefix" >> config.mak
|
|
echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak
|
|
echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak
|
|
echo "INCDIR=\$(DESTDIR)$incdir" >> config.mak
|