Rev 356: Added a few things to make DESTDIR installs work right. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

[Monty Taylor]

At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/devel

------------------------------------------------------------
revno: 356
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Sun 2007-12-09 23:53:34 -0600
message:
  Added a few things to make DESTDIR installs work right. 
modified:
  mgmpp/Makefile.am              makefile.am-20071206045946-ugo2x6q480oerp8f-2
  perl/Makefile.am               makefile.am-20070228070325-lv4v4ey3018yr147-1
  python/Makefile.am             makefile.am-20070925115907-x2wrdte5kicyfrrw-1
=== modified file 'mgmpp/Makefile.am'
--- a/mgmpp/Makefile.am	2007-12-06 09:25:04 +0000
+++ b/mgmpp/Makefile.am	2007-12-10 05:53:34 +0000
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libmgmpp.la
+noinst_LTLIBRARIES = libmgmpp.la
 
 libmgmpp_la_CPPFLAGS = $(JAVA_CXXFLAGS) $(PTHREAD_CFLAGS) -fPIC
 

=== modified file 'perl/Makefile.am'
--- a/perl/Makefile.am	2007-12-06 09:25:04 +0000
+++ b/perl/Makefile.am	2007-12-10 05:53:34 +0000
@@ -23,12 +23,12 @@
 	$(SWIG) $(SWIG_OPTS) -o mgmapi/mgmapi_wrap.cpp mgmapi.i
 
 $(PERL_MAKEFILE): $(srcdir)/Makefile.PL ndbapi/ndbapi_wrap.cpp mgmapi/mgmapi_wrap.cpp
lib/mysql/cluster/ndbapi.pm lib/mysql/cluster/mgmapi.pm $(srcdir)/Makefile.am
-	CFLAGS="-I../.. -I../../mgmpp $(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)"
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(LIBS)" $(PERL) $(srcdir)/Makefile.PL $(MAKE_PL_OPTS)
+	CFLAGS="-I../.. -I../../mgmpp $(CPPFLAGS) $(CFLAGS) $(MYSQL_INCLUDES)"
LDFLAGS="$(AM_LDFLAGS) $(LDFLAGS) $(LIBS)" PREFIX="${prefix}" $(PERL)
$(srcdir)/Makefile.PL $(MAKE_PL_OPTS) PREFIX="${prefix}"
 	
 -perl install-perl: $(PERL_MAKEFILE)
 	@target=`echo $@ | sed -e 's/-perl//'`; \
 	echo $(MAKE) -f $(PERL_MAKEFILE) $$target; \
-	$(MAKE) -f $(PERL_MAKEFILE) $$target
+	DESTDIR=$(DESTDIR) $(MAKE) $(AM_MAKEFLAGS) -f $(PERL_MAKEFILE) $$target 
 
 test-perl: $(PERL_MAKEFILE)
 	$(RUN)$(MAKE) -f $(PERL_MAKEFILE) test

=== modified file 'python/Makefile.am'
--- a/python/Makefile.am	2007-12-07 10:40:58 +0000
+++ b/python/Makefile.am	2007-12-10 05:53:34 +0000
@@ -3,7 +3,7 @@
 pythonarchdir=$(PYTHON_DIR)
 pythonarch_DATA=${builddir}/mysql/cluster/_ndbapi.so ${builddir}/mysql/cluster/_mgmapi.so
 
-CLEANFILES=ndbapi.cpp ndbapi.h mgmapi.cpp mysql/cluster/ndbapi.py mysql/cluster/mgmapi.py
mysql/cluster/events.py mysql/cluster/listeners.py *.so mysql/cluster/*pyc *pyc mgmapi.h
events.cpp listeners.cpp events.h listeners.h
+CLEANFILES=ndbapi.cpp ndbapi.h mgmapi.cpp mysql/cluster/ndbapi.py mysql/cluster/mgmapi.py
mysql/cluster/events.py mysql/cluster/listeners.py *.so mysql/cluster/*pyc *pyc mgmapi.h
events.cpp listeners.cpp events.h listeners.h mysql/cluster/*.so
 EXTRA_DIST = *py mgmapi.i ndbapi.i events.i listeners.i PKG-INFO README MANIFEST.in
mysql/cluster/alchemy.py mysql/__init__.py mysql/cluster/__init__.py 
mysql/cluster/NdbObject mysql/cluster/tests
 
 SWIG_OPTS=-O -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/mgmpp
-I$(SWIG_DIR) @MYSQL_INCLUDES@ -outdir $(builddir)/mysql/cluster
@@ -36,7 +36,8 @@
 	@test ${builddir}/mysql -ef ${srcdir}/mysql || rm -rf ${builddir}/mysql
 
 install: $(builddir)/mysql/cluster/_ndbapi.so $(builddir)/mysql/cluster/_mgmapi.so 
-	CC="${CXX}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ${PYTHON}
${srcdir}/setup.py install --prefix=${DESTDIR}${prefix}
+	@mkdir -p ${pythondir}
+	PYTHONPATH="${PYTHONPATH}:${pythondir}" CC="${CXX}" CFLAGS="${CFLAGS}"
CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ${PYTHON} ${srcdir}/setup.py install
--prefix=${DESTDIR}${prefix} --single-version-externally-managed --root=/
 
 develop: $(builddir)/mysql/cluster/_ndbapi.so $(builddir)/mysql/cluster/_mgmapi.so
 	CC="${CXX}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" ${PYTHON}
setup.py develop --prefix=${DESTDIR}${prefix}