From 892497273aded092ffce1f26cf8a9e2b94ffc9c8 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Fri, 19 Apr 2013 17:02:54 +0100
Subject: [PATCH] Cleaned up script generation and got rid of the atrocious
 gen_script.sh

---
 .gitignore                    |  1 -
 src/scripts/Makefile.am       | 17 ++++++-----------
 src/scripts/clouseau          |  8 ++++++++
 src/scripts/clouseau_start.in |  7 +++++++
 src/scripts/gen_script.sh     | 24 ------------------------
 5 files changed, 21 insertions(+), 36 deletions(-)
 create mode 100644 src/scripts/clouseau
 create mode 100644 src/scripts/clouseau_start.in
 delete mode 100755 src/scripts/gen_script.sh

diff --git a/.gitignore b/.gitignore
index 75b0d41..f1f2910 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,5 @@ coverage
 INSTALL
 src/bin/client
 src/bin/clouseaud
-src/scripts/clouseau
 src/bin/clouseau_client
 src/scripts/clouseau_start
diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am
index ee6c431..564d550 100644
--- a/src/scripts/Makefile.am
+++ b/src/scripts/Makefile.am
@@ -1,16 +1,11 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-EXTRA_DIST = gen_script.sh
+clouseau_start: clouseau_start.in
+	$(AM_V_GEN) $(SED) -e "s|\@libdir\@|$(libdir)|" $(srcdir)/clouseau_start.in > $(builddir)/clouseau_start
 
-uninstall-local:
-	rm -f $(DESTDIR)$(bindir)/clouseau
-	rm -f $(DESTDIR)$(bindir)/clouseau_start
+bin_SCRIPTS = clouseau clouseau_start
 
-clean-local:
-	rm -f clouseau
-	rm -f clouseau_start
+CLEAN_FILES = clouseau_start
 
-install-exec-local:
-	$(srcdir)/gen_script.sh $(libdir)/clouseau
-	$(INSTALL) clouseau_start $(DESTDIR)$(bindir)
-	$(INSTALL) clouseau $(DESTDIR)$(bindir)
+# FIXME: I'm not even sure .in files should be included here.
+EXTRA_DIST = clouseau_start.in
diff --git a/src/scripts/clouseau b/src/scripts/clouseau
new file mode 100644
index 0000000..3b661f6
--- /dev/null
+++ b/src/scripts/clouseau
@@ -0,0 +1,8 @@
+#!/bin/sh
+clouseau_client &
+if [ $# -gt 0 ]
+then
+   # Start clouseau daemon (will start single instance), then run app
+   clouseau_start "$@"
+fi
+
diff --git a/src/scripts/clouseau_start.in b/src/scripts/clouseau_start.in
new file mode 100644
index 0000000..1c53cb6
--- /dev/null
+++ b/src/scripts/clouseau_start.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+if [ $# -lt 1 ]
+then
+   echo "Usage: clouseau_start <executable> [executable parameters]"
+else
+   LD_PRELOAD="@libdir@/clouseau/libclouseau_preload.so" "$@"
+fi
diff --git a/src/scripts/gen_script.sh b/src/scripts/gen_script.sh
deleted file mode 100755
index 0a0b44f..0000000
--- a/src/scripts/gen_script.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-cat <<-ENDOFMESSAGE>clouseau_start
-#!/bin/sh
-if [ \$# -lt 1 ]
-then
-   echo "Usage: clouseau_start <executable> [executable parameters]"
-else
-   LD_PRELOAD="$1/libclouseau_preload.so" "\$@"
-fi
-ENDOFMESSAGE
-
-cat <<-ENDOFMESSAGE>clouseau
-#!/bin/sh
-clouseau_client &
-if [ \$# -gt 0 ]
-then
-   # Start clouseau daemon (will start single instance), then run app
-   clouseau_start "\$@"
-fi
-
-ENDOFMESSAGE
-
-chmod +x clouseau
-chmod +x clouseau_start