From: Ian Jackson <ian@anarres>
Date: Thu, 5 Oct 2006 18:04:32 +0000 (+0100)
Subject: organise files into the right places
X-Git-Tag: converted-from-bzr~64^2~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1b04dc7e9bfc4847318b42e63d9cd88aa75f9453;p=autopkgtest.git

organise files into the right places
---

diff --git a/debian/rules b/debian/rules
index 6c6c3bb..edb8998 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,8 @@
 # See the file CREDITS for a full list of credits information (often
 # installed as /usr/share/doc/autopkgtest/CREDITS).
 
+SHELL=/bin/bash
+
 p=autopkgtest
 px=autopkgtest-xenlvm
 topdir=`pwd`
@@ -38,8 +40,10 @@ binary binary-indep: checkdir
 	dh_installdirs usr
 
 	$(MAKE) install-here prefix=debian/$p/usr
-	$(MAKE) -C xen install pkgname=$(px) \
+	$(MAKE) -C xen install \
+		pkgname=autopkgtest-xenlvm \
 		prefix=$(topdir)/debian/$(px)/usr \
+		sharedir=$(topdir)/debian/$(px)/usr/share/autopkgtest/xenlvm \
 		etcdir=$(topdir)/debian/$(px)/etc cfg_suffix=''
 
 	cat CREDITS debian/copyright.suffix \
diff --git a/xen/Makefile b/xen/Makefile
index f4bb374..38f6dab 100644
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -31,7 +31,7 @@ exec_prefix =	adt-xenlvm-
 all:		readconfig
 
 install:	all
-	$(INSTALL_DIRS) -d $(bindir) $(docdir) $(man1dir) \
+	$(INSTALL_DIRS) $(bindir) $(docdir) $(man1dir) \
 		$(sharedir) $(etcinitddir) $(xenscripts)
 	set -e; for f in $(programs) $(shareprograms); do \
 		$(INSTALL_PROGRAM) $$f $(sharedir); \