diff options
| author | Matthew Booth <mbooth@redhat.com> | 2009-07-03 11:52:50 +0100 |
|---|---|---|
| committer | Matthew Booth <mbooth@redhat.com> | 2009-07-03 16:16:51 +0100 |
| commit | 349814e9d912c4f372b8fbdfb10b03749911021f (patch) | |
| tree | 7168b6ee4dadd363a28a73e2a5ff26799395d75c /appliance | |
| parent | 5f9cb51f11879ece8b921d833850505d7e57d339 (diff) | |
| download | libguestfs-349814e9d912c4f372b8fbdfb10b03749911021f.tar.gz libguestfs-349814e9d912c4f372b8fbdfb10b03749911021f.tar.xz libguestfs-349814e9d912c4f372b8fbdfb10b03749911021f.zip | |
Make it possible to build in a separate directory
This patch allows you to do:
mkdir build
cd build
../configure ...
make
This will output all generated files to the build directory. Given that
autogen automatically runs configure, you can also do:
BUILDDIR=./build ./autogen.sh
which will do the right thing.
Also:
* Fix a dependency bug which means that guestfs_protocol.h
isn't automatically rebuilt.
* Re-running autogen.sh with no arguments won't blow away your previous
configure arguments.
Diffstat (limited to 'appliance')
| -rw-r--r-- | appliance/Makefile.am | 1 | ||||
| -rwxr-xr-x | appliance/make.sh.in | 5 | ||||
| -rwxr-xr-x | appliance/update.sh.in | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/appliance/Makefile.am b/appliance/Makefile.am index e2b0b315..7abee80d 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -105,6 +105,7 @@ debirf_symlinks = \ noinst_DATA = $(debirf_symlinks:%=debian/modules/%) $(debirf_symlinks:%=debian/modules/%): stamp-debirf-modules stamp-debirf-modules: + mkdir -p debian/modules for f in $(debirf_symlinks); do \ ln -sf /usr/share/debirf/modules/$$f debian/modules/$$f; \ done diff --git a/appliance/make.sh.in b/appliance/make.sh.in index 57f5223f..a132ed88 100755 --- a/appliance/make.sh.in +++ b/appliance/make.sh.in @@ -21,6 +21,7 @@ unset CDPATH set -e +set -x if [ "@DIST@" = "REDHAT" ]; then cd @top_builddir@ @@ -65,8 +66,8 @@ if [ "@DIST@" = "REDHAT" ]; then # Don't need any keyboard maps. @FEBOOTSTRAP_RUN@ initramfs -- rm -rf /lib/kbd - # Remove anything in home directory. Because this is potentially - # liable to monstrous fuck-ups, we don't put a slash before 'home'. + # Remove anything in home directory. Because of the potential for disaster + # we don't put a slash before 'home'. (cd initramfs && echo home/*) | xargs @FEBOOTSTRAP_RUN@ initramfs -- rm -rf diff --git a/appliance/update.sh.in b/appliance/update.sh.in index 01e22b60..cdc441b1 100755 --- a/appliance/update.sh.in +++ b/appliance/update.sh.in @@ -28,7 +28,7 @@ if [ "@DIST@" = "REDHAT" ]; then output=appliance/initramfs.@REPO@.@host_cpu@.img # Create the init script. - @FEBOOTSTRAP_INSTALL@ initramfs appliance/init /init 0755 root.root + @FEBOOTSTRAP_INSTALL@ initramfs appliance/@top_srcdir@/appliance/init /init 0755 root.root # Copy the daemon into the filesystem. @FEBOOTSTRAP_INSTALL@ initramfs daemon/guestfsd /sbin/guestfsd 0755 root.root |