From 85701baede56edd4fba042f98550b8dec1a73127 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@suse.de>
Date: Wed, 14 Sep 2005 17:29:27 +0200
Subject: [PATCH] add install test to 'make buildtest'

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
---
 Makefile                   | 36 ++++++++++++++++++------------------
 extras/cdrom_id/Makefile   |  7 -------
 extras/scsi_id/Makefile    |  6 ++++--
 test/simple-build-check.sh | 19 +++++++++++++++----
 4 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index 46d536569..c0e1e46ad 100644
--- a/Makefile
+++ b/Makefile
@@ -358,14 +358,14 @@ install-man:
 .PHONY: install-man
 
 uninstall-man:
-	- rm $(mandir)/man8/udev.8
-	- rm $(mandir)/man8/udevinfo.8
-	- rm $(mandir)/man8/udevtest.8
-	- rm $(mandir)/man8/udevstart.8
-	- rm $(mandir)/man8/udevd.8
-	- rm $(mandir)/man8/udevmonitor.8
-	- rm $(mandir)/man8/udevsend.8
-	- rm $(mandir)/man8/udevcontrol.8
+	- rm -f $(mandir)/man8/udev.8
+	- rm -f $(mandir)/man8/udevinfo.8
+	- rm -f $(mandir)/man8/udevtest.8
+	- rm -f $(mandir)/man8/udevstart.8
+	- rm -f $(mandir)/man8/udevd.8
+	- rm -f $(mandir)/man8/udevmonitor.8
+	- rm -f $(mandir)/man8/udevsend.8
+	- rm -f $(mandir)/man8/udevcontrol.8
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
 		$(MAKE) prefix=$(prefix) -C $$target $@; \
@@ -394,16 +394,16 @@ endif
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(sbindir)/udev
-	- rm $(sbindir)/udevd
-	- rm $(sbindir)/udevsend
-	- rm $(sbindir)/udevinitsend
-	- rm $(sbindir)/udeveventrecoreder
-	- rm $(sbindir)/udevcontrol
-	- rm $(sbindir)/udevstart
-	- rm $(usrsbindir)/udevmonitor
-	- rm $(usrbindir)/udevinfo
-	- rm $(usrbindir)/udevtest
+	- rm -f $(sbindir)/udev
+	- rm -f $(sbindir)/udevd
+	- rm -f $(sbindir)/udevsend
+	- rm -f $(sbindir)/udevinitsend
+	- rm -f $(sbindir)/udeveventrecoreder
+	- rm -f $(sbindir)/udevcontrol
+	- rm -f $(sbindir)/udevstart
+	- rm -f $(usrsbindir)/udevmonitor
+	- rm -f $(usrbindir)/udevinfo
+	- rm -f $(usrbindir)/udevtest
 	- rm -rf $(udevdb)
 	- killall udevd
 	@extras="$(EXTRAS)"; for target in $$extras; do \
diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile
index 3e91d4fc4..c3ee6e329 100644
--- a/extras/cdrom_id/Makefile
+++ b/extras/cdrom_id/Makefile
@@ -65,10 +65,3 @@ uninstall-man:
 install-config:
 	@echo "no config file to install"
 .PHONY: install-config
-
-install: all install-bin install-config install-man
-.PHONY: install
-
-uninstall: uninstall-bin uninstall-man
-.PHONY: uninstall
-
diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index bb3422a9c..85f6ff6ca 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -37,8 +37,6 @@ CC = $(CROSS)gcc
 LD = $(CROSS)gcc
 AR = $(CROSS)ar
 STRIPCMD = $(CROSS)strip
-RANLIB = $(CROSS)ranlib
-HOSTCC = gcc
 CFLAGS += -Wall -pipe -fno-builtin -Wstrict-prototypes -Wsign-compare -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
 LDFLAGS += -Wl
 
@@ -90,4 +88,8 @@ install-config:
 	fi
 .PHONY: install-config
 
+install: all install-bin install-config install-man
+.PHONY: install
 
+uninstall: uninstall-bin uninstall-man
+.PHONY: uninstall
diff --git a/test/simple-build-check.sh b/test/simple-build-check.sh
index 8becb0b05..e69c6451a 100755
--- a/test/simple-build-check.sh
+++ b/test/simple-build-check.sh
@@ -15,24 +15,35 @@ EXTRAS="\
 [ -z "$KERNEL_DIR" ] && KERNEL_DIR=/lib/modules/`uname -r`/build
 echo KERNEL_DIR: "$KERNEL_DIR"
 
-make spotless EXTRAS="$EXTRAS" >/dev/null
-make all $MAKEOPTS EXTRAS="$EXTRAS" || exit
-echo -e "\n\n"
-
+# with debug
 make spotless EXTRAS="$EXTRAS" >/dev/null
 make all -j4 $MAKEOPTS DEBUG=true EXTRAS="$EXTRAS"  || exit
 echo -e "\n\n"
 
+# without any logging
 make spotless EXTRAS="$EXTRAS" >/dev/null
 make all $MAKEOPTS USE_LOG=false EXTRAS="$EXTRAS"  || exit
 echo -e "\n\n"
 
+# klibc and debug
 make spotless EXTRAS="$EXTRAS" >/dev/null
 make all -j4 $MAKEOPTS USE_KLIBC=true DEBUG=true EXTRAS="$EXTRAS" KERNEL_DIR="$KERNEL_DIR" || exit
 echo -e "\n\n"
 
+# klibc without logging
 make spotless EXTRAS="$EXTRAS" >/dev/null
 make all $MAKEOPTS USE_KLIBC=true USE_LOG=false EXTRAS="$EXTRAS" KERNEL_DIR="$KERNEL_DIR" || exit
 echo -e "\n\n"
 
+# install in temporary dir and show it
+TEMPDIR="`pwd`/.tmp"
+rm -rf $TEMPDIR
+mkdir $TEMPDIR
+make spotless EXTRAS="$EXTRAS" >/dev/null
+make all $MAKEOPTS DESTDIR="$TEMPDIR" EXTRAS="$EXTRAS" || exit
+make install DESTDIR="$TEMPDIR" EXTRAS="$EXTRAS" || exit
+echo -e "\nInstalled tree:"
+find $TEMPDIR
+rm -rf $TEMPDIR
+
 make spotless EXTRAS="$EXTRAS" >/dev/null
-- 
2.30.2