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

[Michael Prokop]

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

Modified:
   branches/stable/3.4/Makefile
Log:
* Makefile, fai-nfsroot.dirs, fai-nfsroot.install, get-boot-info: Install dhclient-fai.conf and dhclient-fai-script into /usr/share/fai instead of /etc/dhcp3 (closes: #585063). * dhcp-edit, control: Updated to work with isc-dhcp-server or dhcp3-server, whichever is available. * fai-guide.txt: Updated to isc-dhcp-server.


Conflicts:

	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:40 UTC (rev 6028)
+++ branches/stable/3.4/Makefile	2010-08-17 12:57:45 UTC (rev 6029)
@@ -25,7 +25,7 @@
 install: 
 	mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,apt/apt.conf.d}
 	mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai $(DESTDIR)/etc/fai/apt
-	mkdir -p $(DESTDIR)/etc/{init,init.d} $(DESTDIR)/usr/share/fai/{pixmaps,setup-storage}
+	mkdir -p $(DESTDIR)/etc/{init,init.d} $(DESTDIR)/usr/share/fai/{pixmaps/small,setup-storage}
 	install man/* $(DESTDIR)/man
 	pod2man -c '' -r '' -s8 bin/dhcp-edit > $(DESTDIR)/man/dhcp-edit.8
 	$(MAKE) -C doc install