From 94f3875d99dc6a1f8ebd25700500eca014f08878 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 5 May 2008 15:27:53 +0000
Subject: [PATCH] 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
---
Makefile.am | 2 +-
configure.ac | 1 +
devel/Makefile.am | 9 +++++++++
devel/{upload => upload.in} | 4 ++--
4 files changed, 13 insertions(+), 3 deletions(-)
create mode 100644 devel/Makefile.am
rename devel/{upload => upload.in} (96%)
mode change 100755 => 100644
diff --git a/Makefile.am b/Makefile.am
index b2a617cb0..98a703598 100644
--- 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 4d10aa110..c41fac790 100644
--- 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
index 000000000..fe2cc43c6
--- /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
new mode 100644
similarity index 96%
rename from devel/upload
rename to devel/upload.in
index 9543ea9c7..e85587a60
--- 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
--
GitLab