[Fai-commit] r6030 - branches/stable/3.4

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:57:49 +0000 (Tue, 17 Aug 2010)
New Revision: 6030

Modified:
   branches/stable/3.4/Makefile
Log:
Fix merge conflict in Makefile.

Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/Makefile
===================================================================
--- branches/stable/3.4/Makefile	2010-08-17 12:57:45 UTC (rev 6029)
+++ branches/stable/3.4/Makefile	2010-08-17 12:57:49 UTC (rev 6030)
@@ -5,7 +5,7 @@
 export DOCDIR = $(shell pwd)/debian/fai-doc/usr/share/doc/fai-doc
 LIBDIR = $(DESTDIR)/usr/lib/fai
 SHAREDIR = $(DESTDIR)/usr/share/fai
-USRSBIN_SCRIPTS = make-fai-nfsroot fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai setup_harddisks faireboot fai-statoverride setup-storage dhcp-edit
+USRSBIN_SCRIPTS = make-fai-nfsroot fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai faireboot fai-statoverride setup-storage dhcp-edit
 
 USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub policy-rc.d.fai ainsl faimond-gui
 
@@ -33,7 +33,6 @@
 	install lib/setup-storage/* $(SHAREDIR)/setup-storage
 	cd bin ; install $(USRSBIN_SCRIPTS) $(DESTDIR)/usr/sbin
 	cd bin ; install $(USRBIN_SCRIPTS) $(DESTDIR)/usr/bin
-	install bin/fai-start-stop-daemon $(DESTDIR)/sbin
 	install bin/dhclient-fai-script  $(DESTDIR)/usr/share/fai
 	install -m644 conf/dhclient-fai.conf $(DESTDIR)/usr/share/fai
 	install -m644 conf/apt.conf $(DESTDIR)/etc/apt/apt.conf.d/90fai
@@ -45,7 +44,8 @@
 	install -m644 conf/menu.lst.boot-only $(DESTDIR)/usr/share/fai/menu.lst
 	install -m644 conf/upstart-fai.conf $(DESTDIR)/etc/init/fai.conf
 	install -m755 lib/fai-abort $(DESTDIR)/etc/init.d
-	install -p -m644 pixmaps/*.gif $(DESTDIR)/usr/share/fai/pixmaps
+	cp -a pixmaps/*.gif $(DESTDIR)/usr/share/fai/pixmaps
+	cp -a pixmaps/small/*.gif $(DESTDIR)/usr/share/fai/pixmaps/small
 	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
 	cp -a examples $(DOCDIR)
 	cp -a utils $(DOCDIR)/examples