X11R6 problem fixed

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@6102 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
segler 2011-05-18 13:11:05 +00:00
parent e7c8b45711
commit 767a1cf625

View File

@ -72,28 +72,22 @@
SRCPATH=MultiMedia/Apps
premk() {
# mv global_config global_config.bak
# sed -e "s/^PREFIX = /PREFIX = \$(DESTDIR)/g" <global_config.bak >global_config
#
# for i in `find . -name Makefile*`; do
# mv $i /tmp/makefile.$$
# </tmp/makefile.$$ >$i sed -e "s/\/usr/\$(DESTDIR)\/usr/g"
# done
#
# mkdir -p $TMPROOT/usr/bin $TMPROOT/usr/lib
#
X11R7_Fix
# echo "nothing to do for premk()"
find . -type f -maxdepth 1 -exec sed -iORIG "s/X11R6/X11R7/g" {} \;
find ./cinelerra/ -type f -exec sed -iORIG "s/X11R6/X11R7/g" {} \;
}
mk() {
CC="gcc $BUILDOPTIONS" \
CXX="g++ $BUILDOPTIONS" \
LDFLAGS="-L/${LIBDIR} -L/usr/X11R7/${LIBDIR} -L/usr/${LIBDIR}" \
./configure --target=$TARGET \
--sysconfdir=/etc/cinelerra \
--prefix=/usr/X11R7
LDFLAGS="-L/${LIBDIR} -L/usr/X11R7/${LIBDIR} -L/usr/${LIBDIR}" \
make -j $NUMCPU
LDFLAGS="-L/${LIBDIR} -L/usr/X11R7/${LIBDIR} -L/usr/${LIBDIR}" \
make -j $NUMCPU install
# make -j $NUMCPU -f build/Makefile.cinelerra DESTDIR=$TMPROOT install
mkdir -p $TMPROOT/opt/cinelerra
@ -104,6 +98,5 @@ postmk() {
mkdir -p $TMPROOT/usr/share/doc/
cp -a bin/doc $TMPROOT/usr/share/doc/cinerella
mv $TMPROOT/usr/share/doc/* $TMPROOT/usr/share/doc/cinerella 2>/dev/null
}