From 9c1db9cab3af973839ecf61a633a6e83be8945b6 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Fri, 4 Jun 2021 12:51:32 +0200
Subject: [PATCH] contrib: drop os marker files, check Makefile instead

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 contrib/alpine/Makefile.am    | 2 +-
 contrib/alpine/alpine-release | 1 -
 contrib/alpine/install.sh     | 3 ++-
 contrib/debian/Makefile.am    | 2 +-
 contrib/debian/install.sh     | 2 +-
 contrib/debian/os-release     | 8 --------
 contrib/void/Makefile.am      | 2 +-
 contrib/void/install.sh       | 3 ++-
 contrib/void/xbps             | 0
 9 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 contrib/alpine/alpine-release
 delete mode 100644 contrib/debian/os-release
 delete mode 100644 contrib/void/xbps

diff --git a/contrib/alpine/Makefile.am b/contrib/alpine/Makefile.am
index 48e6da94..d3e12069 100644
--- a/contrib/alpine/Makefile.am
+++ b/contrib/alpine/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS    = finit.d
 docsdir   := @docdir@/contrib/alpine
-docs_DATA  = README.md finit.conf alpine-release build.sh install.sh rc.local
+docs_DATA  = README.md finit.conf build.sh install.sh rc.local
 EXTRA_DIST = $(docs_DATA)
 
diff --git a/contrib/alpine/alpine-release b/contrib/alpine/alpine-release
deleted file mode 100644
index b7276283..00000000
--- a/contrib/alpine/alpine-release
+++ /dev/null
@@ -1 +0,0 @@
-3.6.2
diff --git a/contrib/alpine/install.sh b/contrib/alpine/install.sh
index db69b143..02230f16 100755
--- a/contrib/alpine/install.sh
+++ b/contrib/alpine/install.sh
@@ -8,7 +8,8 @@ if [ "x`id -u`" != "x0" ]; then
 fi
 
 # Adjust base directory
-if [ -e alpine-release ]; then
+grep -q alpine Makefile 2>/dev/null
+if [ $? -eq 0 ]; then
     cd ../..
 elif [ ! -e configure.ac ]; then
     echo "*** Please run this script from the Finit base directory."
diff --git a/contrib/debian/Makefile.am b/contrib/debian/Makefile.am
index 156d91a8..5aa939c9 100644
--- a/contrib/debian/Makefile.am
+++ b/contrib/debian/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS    = finit.d
 docsdir   := @docdir@/contrib/debian
-docs_DATA  = README.md finit.conf os-release build.sh install.sh
+docs_DATA  = README.md finit.conf build.sh install.sh
 EXTRA_DIST = $(docs_DATA)
diff --git a/contrib/debian/install.sh b/contrib/debian/install.sh
index 7a0fb362..d5e22950 100755
--- a/contrib/debian/install.sh
+++ b/contrib/debian/install.sh
@@ -8,7 +8,7 @@ if [ "x`id -u`" != "x0" ]; then
 fi
 
 # Adjust base directory
-grep -q Debian os-release 2>/dev/null
+grep -q debian Makefile 2>/dev/null
 if [ $? -eq 0 ]; then
     cd ../..
 elif [ ! -e configure.ac ]; then
diff --git a/contrib/debian/os-release b/contrib/debian/os-release
deleted file mode 100644
index 120c51b0..00000000
--- a/contrib/debian/os-release
+++ /dev/null
@@ -1,8 +0,0 @@
-PRETTY_NAME="Debian GNU/Linux 8 (jessie)"
-NAME="Debian GNU/Linux"
-VERSION_ID="8"
-VERSION="8 (jessie)"
-ID=debian
-HOME_URL="http://www.debian.org/"
-SUPPORT_URL="http://www.debian.org/support"
-BUG_REPORT_URL="https://bugs.debian.org/"
diff --git a/contrib/void/Makefile.am b/contrib/void/Makefile.am
index 8e8cfd6c..44e74033 100644
--- a/contrib/void/Makefile.am
+++ b/contrib/void/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS    = finit.d
 docsdir   := @docdir@/contrib/void
-docs_DATA  = README.md finit.conf build.sh install.sh rc.local xbps
+docs_DATA  = README.md finit.conf build.sh install.sh rc.local
 EXTRA_DIST = $(docs_DATA)
diff --git a/contrib/void/install.sh b/contrib/void/install.sh
index 513a2252..ef09bec9 100755
--- a/contrib/void/install.sh
+++ b/contrib/void/install.sh
@@ -8,7 +8,8 @@ if [ "x`id -u`" != "x0" ]; then
 fi
 
 # Adjust base directory
-if [ -e xbps ]; then
+grep -q void Makefile 2>/dev/null
+if [ $? -eq 0 ]; then
     cd ../..
 elif [ ! -e configure.ac ]; then
     echo "*** Please run this script from the Finit base directory."
diff --git a/contrib/void/xbps b/contrib/void/xbps
deleted file mode 100644
index e69de29b..00000000