[Pkg-lustre-svn-commit] updated: [3ecd949] Adapted debian/rules and debian/*.install files

[Marco Nelles]

The following commit has been merged in the master branch:
commit 3ecd949eea757b9fc3614646c0d1939152eef8ce
Author: Marco Nelles <marco.nelles at credativ.de>
Date:   Mon Jun 4 16:18:45 2012 +0200

    Adapted debian/rules and debian/*.install files

diff --git a/debian/lustre-dev.install b/debian/lustre-dev.install
index cf3af90..2252295 100644
--- a/debian/lustre-dev.install
+++ b/debian/lustre-dev.install
@@ -1,5 +1,5 @@
-debian/build/lnet/utils/libptlctl.a usr/lib
-lustre/contrib/README 	usr/share/doc/lustre-dev/contrib
+lnet/utils/libptlctl.a 			usr/lib
+lustre/contrib/README 			usr/share/doc/lustre-dev/contrib
 lustre/contrib/mpich-1.2.6-lustre.patch usr/share/doc/lustre-dev/contrib
 debian/tmp/usr/include/linux/*		usr/include/linux
 debian/tmp/usr/include/lustre/*		usr/include/lustre
diff --git a/debian/lustre-utils.install b/debian/lustre-utils.install
index 9b41dc2..2eeb844 100644
--- a/debian/lustre-utils.install
+++ b/debian/lustre-utils.install
@@ -1,4 +1,4 @@
-debian/build/lnet/utils/routerstat  		usr/sbin
+lnet/utils/routerstat  				usr/sbin
 debian/tmp/sbin/*				sbin
 debian/tmp/usr/sbin/mkfs.lustre			sbin
 debian/tmp/usr/sbin/*		        	usr/sbin
diff --git a/debian/rules b/debian/rules
index 1c9c68c..c39121f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,9 +57,11 @@ autogen-stamp: patch-stamp
 	cp /usr/share/misc/config.sub config.sub
 	cp /usr/share/misc/config.sub libsysio/config.sub
 	cp /usr/share/misc/config.sub ldiskfs/config.sub
+	cp /usr/share/misc/config.sub libcfs/config.sub
 	cp /usr/share/misc/config.guess config.guess
 	cp /usr/share/misc/config.guess libsysio/config.guess
 	cp /usr/share/misc/config.guess ldiskfs/config.guess
+	cp /usr/share/misc/config.guess libcfs/config.guess
 	sh ./autogen.sh
 	touch $@
 
@@ -68,17 +70,13 @@ configure-stamp: autogen-stamp debian/control
 	dh_testdir
 	# touch files to same date, to avoid auto*
 	find . -type f -exec touch -r COPYING {} \;
-	mkdir -p $(BUILDDIR)/build $(BUILDDIR)/lustre/contrib $(BUILDDIR)/libsysio
-	cp build/Makefile $(BUILDDIR)/build/
-	cp lustre/contrib/mpich-*.patch $(BUILDDIR)/lustre/contrib/
-	ln -s ../../../libsysio/include $(BUILDDIR)/libsysio/
-	( cd $(BUILDDIR) && \
-	 export TOP_DIR=$(TOP_DIR); ../../configure --disable-dependency-tracking \
-		   --disable-modules \
-		   --enable-snmp \
-		   --disable-client \
-		   --enable-quota \
-		   --disable-server )
+	
+	./configure --disable-dependency-tracking \
+		    --disable-modules \
+		    --enable-snmp \
+		    --disable-client \
+		    --enable-quota \
+		    --disable-server
 	# Correct tex2pdf mode.
 	chmod 744 lustre/doc/tex2pdf
 	touch $@
@@ -88,12 +86,8 @@ build-arch build-indep: build
 build: build-stamp
 build-stamp: patch-stamp configure-stamp
 	dh_testdir
-	$(MAKE) -C $(BUILDDIR)
-	# The .pdf's don't get automatically built, so
-	#HOME=$(TOP_DIR)/debian/build/lustre/doc $(MAKE) -C $(BUILDDIR)/lustre/doc lconf.pdf  lctl.pdf  lfs.pdf  lmc.pdf
-	## FIXME: $(BUILDDIR) isn't used
-	# mv lustre/doc/lconf.pdf lustre/doc/lctl.pdf lustre/doc/lfs.pdf lustre/doc/lmc.pdf $(BUILDDIR)/lustre/doc
-	$(MAKE) -C $(BUILDDIR) DESTDIR=$(TOP_DIR)/debian/tmp install
+	$(MAKE)
+	$(MAKE) DESTDIR=$(TOP_DIR)/debian/tmp install
 	touch $@
 
 binary-arch: binary-$(UTILS_PKG) binary-$(TESTS_PKG) binary-$(DEV_PKG) binary-$(LIB_PKG) 
@@ -278,7 +272,7 @@ kdist_config: prep-deb-files
 	# touch files to same date, to avoid auto*
 	find . -type f -exec touch -r COPYING {} \;
 	# Doesn't seem possible to only build modules...
-	 ./configure --with-linux=$(KSRC) $(OFA_KERNEL) \
+	./configure --with-linux=$(KSRC) $(OFA_KERNEL) \
 		    --disable-quilt  \
 		    --disable-dependency-tracking \
 		    --disable-doc  \

-- 
Lustre Debian Packaging