organise files into the right places

diff --git a/debian/rules b/debian/rules
index 6c6c3bb178c985bfa796b0efeb1060f97e004617..edb89984767ec02a45e2ced0c8e80f00a8ce748d 100755 (executable)
--- 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 f4bb374f9c282b0f323c9398aec7f477404c08a8..38f6dab6c4e36554c53df6c9e0e7162f866f6764 100644 (file)
--- 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); \