summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/.gitignore1
-rw-r--r--src/Makefile.am5
-rw-r--r--[-rwxr-xr-x]src/protoc-c.sh.in (renamed from src/protoc-c.sh)3
3 files changed, 5 insertions, 4 deletions
diff --git a/src/.gitignore b/src/.gitignore
index 40e0689..a4818d0 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,4 +1,5 @@
messages.h
mumble.pb-c.c
mumble.pb-c.h
+protoc-c.sh
cmumble
diff --git a/src/Makefile.am b/src/Makefile.am
index fe69d24..fb88fc6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,12 +15,11 @@ AM_CFLAGS = $(GCC_FLAGS)
BUILT_SOURCES = $(nodist_cmumble_SOURCES) $(nodist_noinst_HEADERS)
CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = mumble.proto messages.txt gen_messages.sed protoc-c.sh
+EXTRA_DIST = mumble.proto messages.txt gen_messages.sed
messages.h: $(srcdir)/messages.txt $(srcdir)/gen_messages.sed
$(AM_V_GEN) LC_ALL=C $(SED) -f $(srcdir)/gen_messages.sed $< > $@
mumble.pb-c.c mumble.pb-c.h: $(srcdir)/mumble.proto
- $(AM_V_GEN) PROTOC_C=$(PROTOBUF_EXECUTABLE) \
- $(srcdir)/protoc-c.sh $< $@
+ $(AM_V_GEN) $(builddir)/protoc-c.sh $< $@
diff --git a/src/protoc-c.sh b/src/protoc-c.sh.in
index 4147799..788d743 100755..100644
--- a/src/protoc-c.sh
+++ b/src/protoc-c.sh.in
@@ -1,6 +1,7 @@
#!/bin/sh
+# @configure_input@
-PROTOC_C=${PROTOC_C:-protoc-c}
+PROTOC_C=@PROTOC_C@
build_dir=".protoc-c_build_$(basename $2)/"