Generate devel/upload during build time from template

- Use variable with prefix instead of grep and sed
- Always run with /bin/bash

Reviewed-by: ultrotter

diff --git a/Makefile.am b/Makefile.am
index b2a617c..98a7035 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I autotools
 
-SUBDIRS = man lib scripts daemons doc test tools qa
+SUBDIRS = man lib scripts daemons doc test tools qa devel
 EXTRA_DIST = NEWS DEVNOTES
 
 .PHONY: ganeti

diff --git a/configure.ac b/configure.ac
index 4d10aa1..c41fac7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,7 @@ fi
 AC_CONFIG_FILES([
   Makefile
   daemons/Makefile
+  devel/Makefile
   doc/Makefile
   doc/examples/Makefile
   lib/Makefile

diff --git a/devel/Makefile.am b/devel/Makefile.am
new file mode 100644 (file)
index 0000000..fe2cc43
--- /dev/null
+++ b/devel/Makefile.am
@@ -0,0 +1,9 @@
+EXTRA_DIST = upload.in
+CLEANFILES = upload
+
+all-local: upload
+upload: upload.in
+       sed \
+         -e 's#@PREFIX@#$(prefix)#g' \
+       < $< > $@
+       chmod u+x $@

diff --git a/devel/upload b/devel/upload.in
old mode 100755 (executable)
new mode 100644 (file)
similarity index 96%
rename from devel/upload
rename to devel/upload.in
index 9543ea9..e85587a
--- a/devel/upload
+++ b/devel/upload.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (C) 2006, 2007 Google Inc.
 #
@@ -38,7 +38,7 @@ echo ---
 
 echo ---
 
-PREFIX=$(cat Makefile | grep '^prefix' | sed -e 's/.*= //')
+PREFIX='@PREFIX@'
 
 # and now put it under $prefix on the target node(s)
 for host; do