[Fai-commit] r4960 - trunk

[lange at alioth.debian.org]

Author: lange
Date: 2008-06-12 12:33:53 +0000 (Thu, 12 Jun 2008)
New Revision: 4960

Modified:
   trunk/Makefile
Log:
Adding setup-storage to trunk

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-06-12 12:20:29 UTC (rev 4959)
+++ trunk/Makefile	2008-06-12 12:33:53 UTC (rev 4960)
@@ -4,11 +4,13 @@
 DESTDIR=$(shell pwd)/debian/tmp
 export DOCDIR = $(shell pwd)/debian/fai-doc/usr/share/doc/fai-doc
 LIBDIR = $(DESTDIR)/usr/lib/fai
-USRSBIN_SCRIPTS = make-fai-nfsroot make-fai-bootfloppy fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai setup_harddisks faireboot fai-statoverride
+SHAREDIR = $(DESTDIR)/usr/share/fai
+USRSBIN_SCRIPTS = make-fai-nfsroot make-fai-bootfloppy fai-setup fcopy ftar install_packages fai-chboot faimond fai-cd fai setup_harddisks faireboot fai-statoverride setup-storage
 
 USRBIN_SCRIPTS = fai-class fai-do-scripts fai-mirror fai-debconf device2grub policy-rc.d.fai ainsl faimond-gui
 
-libfiles=$(wildcard lib/[a-z]*)  # do not include .svn dir and S01
+# do not include .svn dir and setup-storage subdir
+libfiles=$(patsubst lib/setup-storage,,$(wildcard lib/[a-z]*))
 
 # files with variable KERNLEVERSION in it; this string will be substituted
 KVERSION_FILES =  $(DESTDIR)/etc/fai/make-fai-nfsroot.conf
@@ -26,10 +28,11 @@
 install: 
 	mkdir -p $(DESTDIR)/{sbin,man} $(DESTDIR)/etc/{modutils,dhcp3,apt/apt.conf.d}
 	mkdir -p $(DESTDIR)/usr/{sbin,bin} $(DESTDIR)/usr/lib/fai $(DESTDIR)/etc/fai/apt
-	mkdir -p $(DESTDIR)/etc/init.d $(DESTDIR)/usr/share/fai/pixmaps
+	mkdir -p $(DESTDIR)/etc/init.d $(DESTDIR)/usr/share/fai/{pixmaps,setup-storage}
 	install man/* $(DESTDIR)/man
 	$(MAKE) -C doc install
 	-install $(libfiles) $(LIBDIR)
+	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