daemon: debug segv correct use of dereferencing NULL.

[libguestfs.git] / appliance / Makefile.am

diff --git a/appliance/Makefile.am b/appliance/Makefile.am
index cd4952a..e2e8b96 100644 (file)
--- a/appliance/Makefile.am
+++ b/appliance/Makefile.am
@@ -13,12 +13,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \
        packagelist.in \
+       excludelist.in \
        init \
        make.sh.in
 
@@ -43,10 +44,16 @@ make.sh: make.sh.in
 
 packagelist: packagelist.in
        cpp -undef -D$(DISTRO)=1 < $< | \
-       grep -v '^[[:space:]]*$$' | grep -v '^#' > $@
+       grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
+       mv $@-t $@
+
+excludelist: excludelist.in
+       cpp -undef -D$(DISTRO)=1 < $< | \
+       grep -v '^[[:space:]]*$$' | grep -v '^#' > $@-t
+       mv $@-t $@
 
 supermin.d/base.img supermin.d/hostfiles: stamp-supermin
-stamp-supermin: make.sh packagelist
+stamp-supermin: make.sh packagelist excludelist
        mkdir -p supermin.d
        rm -f $@ supermin.d/base.img supermin.d/hostfiles
        ./make.sh
@@ -62,6 +69,7 @@ supermin.d/daemon.img: ../daemon/guestfsd
        mv $@-t $@
 
 supermin.d/init.img: init
+       cmp -s $(srcdir)/init $(builddir)/init || cp $(srcdir)/init $(builddir)/init
        mkdir -p supermin.d
        rm -f $@ $@-t
        echo "init" | cpio --quiet -o -H newc > $@-t
@@ -69,7 +77,7 @@ supermin.d/init.img: init
 
 # Make clean.
 
-CLEANFILES = packagelist
+CLEANFILES = packagelist excludelist
 
 clean-local:
        rm -rf supermin.d