--- Makefile.am.orig 2012-10-09 11:10:42.025499433 +0200 +++ Makefile.am 2012-10-09 11:13:45.828865034 +0200 @@ -82,27 +82,27 @@ cd $(top_builddir)/adm/make && $(MAKE) $(AM_MAKEFLAGS) Draw install-exec-local: - $(INSTALL) -d $(prefix)/$(platform) - if [ -e $(prefix)/bin -a ! -e $(prefix)/$(platform)/bin ]; then \ - cd $(prefix)/$(platform) && ln -s ../bin bin; \ + $(INSTALL) -d $(DESTDIR)$(prefix)/$(platform) + if [ -e $(DESTDIR)$(prefix)/bin -a ! -e $(DESTDIR)$(prefix)/$(platform)/bin ]; then \ + cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../bin bin; \ fi - if [ -e $(prefix)/lib -a ! -e $(prefix)/$(platform)/lib ]; then \ - cd $(prefix)/$(platform) && ln -s ../lib lib; \ + if [ -e $(DESTDIR)$(prefix)/lib -a ! -e $(DESTDIR)$(prefix)/$(platform)/lib ]; then \ + cd $(DESTDIR)$(prefix)/$(platform) && ln -s ../lib lib; \ fi - buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(prefix); installd=`pwd`; cd $$buildd; \ + buildd=`pwd`; cd $(top_srcdir); sourced=`pwd`; cd $(DESTDIR)$(prefix); installd=`pwd`; cd $$buildd; \ if [ "$$installd" != "$$sourced" ]; then \ - $(INSTALL) -d $(prefix)/inc; \ - cp -frL $(top_srcdir)/inc $(prefix); \ - cp -frL $$buildd/config.h $(prefix); \ + $(INSTALL) -d $(DESTDIR)$(prefix)/inc; \ + cp -frL $(top_srcdir)/inc $(DESTDIR)$(prefix); \ + cp -frL $$buildd/config.h $(DESTDIR)$(prefix); \ for d in $(FoundationClasses_DIRS) $(ModelingData_DIRS) $(ModelingAlgorithms_DIRS) $(Visualization_DIRS) $(ApplicationFramework_DIRS) $(DataExchange_DIRS) $(Draw_DIRS); do \ - $(INSTALL) -d $(prefix)/src/$$d; \ - cp -frL $(top_srcdir)/src/$$d $(prefix)/src; \ + $(INSTALL) -d $(DESTDIR)$(prefix)/src/$$d; \ + cp -frL $(top_srcdir)/src/$$d $(DESTDIR)$(prefix)/src; \ done; \ fi - if [ -e $(prefix)/inc/config.h ]; then \ - unlink $(prefix)/inc/config.h; \ + if [ -e $(DESTDIR)$(prefix)/inc/config.h ]; then \ + unlink $(DESTDIR)$(prefix)/inc/config.h; \ fi - cd $(prefix)/inc && ln -s ../config.h config.h - cd $(top_srcdir) && cp *.sh $(prefix) + cd $(DESTDIR)$(prefix)/inc && ln -s ../config.h config.h + cd $(top_srcdir) && cp *.sh $(DESTDIR)$(prefix) .PHONY: FoundationClasses ModelingData ModelingAlgorithms Visualization ApplicationFramework DataExchange Draw \ Brak znaku nowej linii na końcu pliku --- configure.ac.orig 2012-10-12 15:34:08.907271986 +0200 +++ configure.ac 2012-10-12 15:34:39.387279614 +0200 @@ -487,7 +487,7 @@ HAVE_FTGL=no HAVE_FTGL_INC=yes CPPFLAGS="-I$ftgl/include $CPPFLAGS"; - AC_CHECK_HEADER( [FTGL/FTGL.h], [], [HAVE_FTGL_INC=no] ) + AC_CHECK_HEADER( [FTGL/ftgl.h], [], [HAVE_FTGL_INC=no] ) if test ! -d $ftgl; then DISABLE_FTGL_REASON="($ftgl directory is not exists)" AC_MSG_ERROR([$ftgl directory is not exists]) @@ -501,7 +501,7 @@ #we have problem with unresolved symbols on 64 stations CSF_FTGL_LIB="-L$ftgl/lib -lftgl" AC_TRY_LINK([ -#include +#include #include ], [ FTGLTextureFont font("");], [