From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 10 May 2008 12:52:26 +0000 (+0200)
Subject: Made the installer build with busybox tools.
X-Git-Tag: v3.0-alpha1~1021
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd56383608b05c28477e5c13bddc07d07ff9f63a;p=ipfire-3.x.git

Made the installer build with busybox tools.
---

diff --git a/src/pomona/Makefile.inc b/src/pomona/Makefile.inc
index 0032a2bfa..2426ac882 100644
--- a/src/pomona/Makefile.inc
+++ b/src/pomona/Makefile.inc
@@ -28,5 +28,5 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALLNLSDIR = $(DESTDIR)/usr/share/locale
 
-PYTHONLIBDIR = $(DESTDIR)/usr/lib/$(PSNAME)
-PYTHONINCLUDE= /usr/include/python2.5/
+PYTHONLIBDIR = $(DESTDIR)/lib/$(PSNAME)
+PYTHONINCLUDE= $(DESTDIR)/include/python2.5/
diff --git a/src/pomona/src/Makefile b/src/pomona/src/Makefile
index 8418a0523..b3f41d1f9 100644
--- a/src/pomona/src/Makefile
+++ b/src/pomona/src/Makefile
@@ -26,8 +26,8 @@ all: subdirs
 
 install: all
 	-mkdir -p $(PYTHONLIBDIR)
-	cp -vf *.py ../lang-{table,names} $(PYTHONLIBDIR)
-	chmod -v 755 $(PYTHONLIBDIR)/installer.py
+	cp -f *.py ../lang-{table,names} $(PYTHONLIBDIR)
+	chmod 755 $(PYTHONLIBDIR)/installer.py
 	for d in $(SUBDIRS); do make -C $$d install; [ $$? = 0 ] || exit 1; done
 	
 	sed -e "s/VERSION/$(VERSION)/g" \
@@ -40,7 +40,7 @@ install: all
 	sh ../py-compile $(PYTHONLIBDIR)/*.py
 	-mkdir -p $(DESTDIR)/sbin
 	#ln -svf ../usr/lib/$(PSNAME)/installer.py $(DESTDIR)/sbin/$(PSNAME)
-	install -m 755 -v $(PSNAME) $(DESTDIR)/sbin/$(PSNAME)
+	install -m 755 $(PSNAME) $(DESTDIR)/sbin/$(PSNAME)
 
 clean:
 	rm -f *.o *.so *.pyc *.pyo