[Python-ogre-commit] SF.net SVN: python-ogre:[830] trunk/python-ogre/boost

[<mi...@us...>]

Revision: 830
          http://python-ogre.svn.sourceforge.net/python-ogre/?rev=830&view=rev
Author:   mithro
Date:     2008-12-09 08:36:19 +0000 (Tue, 09 Dec 2008)

Log Message:
-----------
Some more small deb package fixes.

Modified Paths:
--------------
    trunk/python-ogre/boost/Makefile
    trunk/python-ogre/boost/debian/rules

Modified: trunk/python-ogre/boost/Makefile
===================================================================
--- trunk/python-ogre/boost/Makefile	2008-12-08 08:36:02 UTC (rev 829)
+++ trunk/python-ogre/boost/Makefile	2008-12-09 08:36:19 UTC (rev 830)
@@ -13,17 +13,18 @@
        -shared \
 		-Wl,-soname,libboost_python_index-gcc${GCC_VERSION}-${BOOST_VERSION}.so \
 		-o libboost_python_index-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}.so -fPIC \
-       -lboost_python-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION} \
        -L${PREFIX}/lib/ \
        -lpython${PYTHON_VERSION} \
 		$(MT_FLAGS)
 
+BOOST_PYTHON1= -lboost_python-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}
+BOOST_PYTHON2= -lboost_python-gcc${GCC_VERSION}-${MT_VERSION}${BOOST_VERSION}-py${PYTHON_VERSION}
 
 all: libs/python/src/indexing/indexing_slice.cpp libs/python/src/indexing/python_iterator.cpp
 	@make version
 	@echo "Current CXXFLAGS: ${CXXFLAGS}"
 	@echo "Running g++ ${CXXFLAGS} $?"
-	@g++ ${CXXFLAGS} $?
+	@g++ ${CXXFLAGS} ${BOOST_PYTHON} $? || g++ ${CXXFLAGS} ${BOOST_PYTHON2} $?
 
 version:
 	@if [ x${BOOST_VERSION} = x ]; then 								\

Modified: trunk/python-ogre/boost/debian/rules
===================================================================
--- trunk/python-ogre/boost/debian/rules	2008-12-08 08:36:02 UTC (rev 829)
+++ trunk/python-ogre/boost/debian/rules	2008-12-09 08:36:19 UTC (rev 830)
@@ -55,8 +55,8 @@
 	dh_installdirs
 	
 	# Add here commands to install the package into debian/tmp
-	make install PREFIX=$(CURDIR)/debian/tmp
-	make install PREFIX=$(CURDIR)/debian/tmp MT=True
+	make install PREFIX=$(CURDIR)/debian/tmp/usr
+	make install PREFIX=$(CURDIR)/debian/tmp/usr MT=True
 
 # Build architecture-independent files here.
 binary-indep: build install


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.