[omd-commits] OMD Git: omd: shinken: fixed build on sles

git version control git at mathias-kettner.de
Thu Dec 30 19:50:31 CET 2010


Module: omd
Branch: master
Commit: 13d4441161e888a031e4f3b865ec1dc150041967
URL:    http://omdistro.org/projects/omd/repository/revisions/13d4441161e888a031e4f3b865ec1dc150041967

Author: Sven Nierlein <sven at nierlein.de>
Date:   Thu Dec 30 17:40:11 2010 +0100

shinken: fixed build on sles

---

 distros/Makefile.SLES_11    |    2 +-
 distros/Makefile.SLES_11SP1 |    2 +-
 packages/shinken/.gitignore |    6 ++++++
 packages/shinken/Makefile   |    4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/distros/Makefile.SLES_11 b/distros/Makefile.SLES_11
index ddbcc2f..b5253b1 100644
--- a/distros/Makefile.SLES_11
+++ b/distros/Makefile.SLES_11
@@ -1,5 +1,5 @@
 DISTRO_CODE     = sles11
-BUILD_PACKAGES    = gcc make gcc-c++ patch cairo-devel pango-devel libxml2-devel libmcrypt-devel libmysqlclient-devel libopenssl-devel gd-devel glib-devel libgnutls-devel openldap2-devel python libjpeg-devel libpng-devel freetype2-devel libexpat-devel readline-devel
+BUILD_PACKAGES    = gcc make gcc-c++ patch cairo-devel pango-devel libxml2-devel libmcrypt-devel libmysqlclient-devel libopenssl-devel gd-devel glib-devel libgnutls-devel openldap2-devel python libjpeg-devel libpng-devel freetype2-devel libexpat-devel readline-devel python-devel
 OS_PACKAGES       = apache2 xinetd apache2-mod_php5 apache2-mod_python php5-gd php5-sqlite php5-mcrypt php5-mbstring php5-sockets samba-client graphviz net-snmp bind-utils fping mysql php5-pear unzip perl-Net-SNMP perl-SNMP rsync xorg-x11-fonts dialog pango libpng12-0 curl patch apache2-mod_fcgid libreadline5
 USERADD_OPTIONS   = -M
 ADD_USER_TO_GROUP = groupmod -A %(user)s %(group)s
diff --git a/distros/Makefile.SLES_11SP1 b/distros/Makefile.SLES_11SP1
index e46d399..e5e3b6a 100644
--- a/distros/Makefile.SLES_11SP1
+++ b/distros/Makefile.SLES_11SP1
@@ -1,5 +1,5 @@
 DISTRO_CODE     = sles11sp1
-BUILD_PACKAGES    = gcc make gcc-c++ patch cairo-devel pango-devel libxml2-devel libmcrypt-devel libmysqlclient-devel libopenssl-devel gd-devel glib-devel libgnutls-devel openldap2-devel python libjpeg-devel libpng-devel freetype2-devel libexpat-devel readline-devel
+BUILD_PACKAGES    = gcc make gcc-c++ patch cairo-devel pango-devel libxml2-devel libmcrypt-devel libmysqlclient-devel libopenssl-devel gd-devel glib-devel libgnutls-devel openldap2-devel python libjpeg-devel libpng-devel freetype2-devel libexpat-devel readline-devel python-devel
 OS_PACKAGES       = apache2 xinetd apache2-mod_php5 apache2-mod_python php5-gd php5-sqlite php5-mcrypt php5-mbstring php5-sockets samba-client graphviz net-snmp bind-utils fping mysql php5-pear unzip perl-Net-SNMP perl-SNMP rsync xorg-x11-fonts dialog pango libpng12-0 curl patch apache2-mod_fcgid libreadline5
 USERADD_OPTIONS   = -M
 ADD_USER_TO_GROUP = groupmod -A %(user)s %(group)s
diff --git a/packages/shinken/.gitignore b/packages/shinken/.gitignore
new file mode 100644
index 0000000..85afd89
--- /dev/null
+++ b/packages/shinken/.gitignore
@@ -0,0 +1,6 @@
+Pyro-3.11.tar.gz
+Pyro-3.11
+multiprocessing-2.6.2.1.tar.gz
+multiprocessing-2.6.2.1
+shinken-0.4.1.tar.gz
+shinken-0.4.1
diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile
index 76cdb03..e66b7dc 100644
--- a/packages/shinken/Makefile
+++ b/packages/shinken/Makefile
@@ -48,10 +48,10 @@ installshinken:
 	install -m 755 merge-shinken-specific-config $(DESTDIR)$(OMD_ROOT)/bin
   
 installpyro:
-	( cd $(PYRO) ; python setup.py install --home=$(DESTDIR)$(OMD_ROOT) --install-scripts=$(DESTDIR)$(OMD_ROOT)/tmp --install-data=$(DESTDIR)$(OMD_ROOT)/tmp )
+	( cd $(PYRO) ; python setup.py install --prefix=$(DESTDIR)$(OMD_ROOT) --install-scripts=$(DESTDIR)$(OMD_ROOT)/tmp --install-data=$(DESTDIR)$(OMD_ROOT)/tmp )
 
 installmp:
-	( cd $(MP) ; PYTHONPATH=$(DESTDIR)$(OMD_ROOT)/lib/python python setup.py install --home=$(DESTDIR)$(OMD_ROOT) --install-scripts=$(DESTDIR)$(OMD_ROOT)/tmp --install-data=$(DESTDIR)$(OMD_ROOT)/tmp )
+	( cd $(MP) ; PYTHONPATH=$(DESTDIR)$(OMD_ROOT)/lib/python python setup.py install --prefix=$(DESTDIR)$(OMD_ROOT) --install-scripts=$(DESTDIR)$(OMD_ROOT)/tmp --install-data=$(DESTDIR)$(OMD_ROOT)/tmp )
 
 clean:
 	rm -rf $(DIR)



More information about the omd-commits mailing list