diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-11-24 14:33:31 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-11-24 14:33:31 +0000 |
| commit | b593ce1b3ce740c17f209c8b33b74ea430bde65b (patch) | |
| tree | af3368b898a6f29a8cb19aa2b7c8a303413b09a9 | |
| parent | 024a50f566496535cdfe5af0e70916a052845822 (diff) | |
| parent | 5f1a3cf8f27043a6f7860552cb78f1f194a33b10 (diff) | |
| download | rabbitmq-c-github-ask-b593ce1b3ce740c17f209c8b33b74ea430bde65b.tar.gz | |
merge bug23472 into default (ac_abs_confdir only available in recent versions of autoconf)
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | librabbitmq/Makefile.am | 8 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 144422d..d5bac3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ squeakyclean: maintainer-clean codegen: mkdir -p $@ - cp -r "@AMQP_CODEGEN_DIR@"/* $@ + cp -r "$(top_srcdir)/$(AMQP_CODEGEN_DIR)"/* $@ $(MAKE) -C $@ clean EXTRA_DIST=codegen debian LICENSE-MPL-RabbitMQ LICENSE-GPL-2.0 diff --git a/configure.ac b/configure.ac index 4077362..ec782fb 100644 --- a/configure.ac +++ b/configure.ac @@ -59,8 +59,10 @@ AC_ARG_ENABLE(64-bit, ) AC_MSG_CHECKING(location of AMQP codegen directory) -sibling_codegen_dir="$ac_abs_confdir/../rabbitmq-codegen" -AMQP_CODEGEN_DIR=$(test -d "$sibling_codegen_dir" && echo "$sibling_codegen_dir" || echo "$ac_abs_confdir/codegen") +for d in ../rabbitmq-codegen codegen ; do + AMQP_CODEGEN_DIR="$d" + test -d "$srcdir/$AMQP_CODEGEN_DIR" && break +done AMQP_SPEC_JSON_PATH="$AMQP_CODEGEN_DIR/amqp-rabbitmq-0.9.1.json" if test -f "$AMQP_SPEC_JSON_PATH" diff --git a/librabbitmq/Makefile.am b/librabbitmq/Makefile.am index a0f8987..1217c49 100644 --- a/librabbitmq/Makefile.am +++ b/librabbitmq/Makefile.am @@ -28,8 +28,8 @@ EXTRA_DIST = \ CODEGEN_PY=$(srcdir)/codegen.py -amqp_framing.h: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) - PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $@ +amqp_framing.h: $(top_srcdir)/$(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) + PYTHONPATH=$(top_srcdir)/$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) header $< $@ -amqp_framing.c: $(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) - PYTHONPATH=$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $@ +amqp_framing.c: $(top_srcdir)/$(AMQP_SPEC_JSON_PATH) $(CODEGEN_PY) + PYTHONPATH=$(top_srcdir)/$(AMQP_CODEGEN_DIR) $(PYTHON) $(CODEGEN_PY) body $< $@ |