python: Improve build system integration.
* lang/python/Makefile.am: Use 'set -e' when chaining shell commands together in rules. Signed-off-by: Justus Winter <justus@g10code.com>
This commit is contained in:
parent
6a37166388
commit
a4201035fd
@ -47,20 +47,19 @@ COPY_FILES_GPG = \
|
|||||||
# For VPATH builds we need to copy some files because Python's
|
# For VPATH builds we need to copy some files because Python's
|
||||||
# distutils are not VPATH-aware.
|
# distutils are not VPATH-aware.
|
||||||
copystamp: $(COPY_FILES) $(COPY_FILES_GPG)
|
copystamp: $(COPY_FILES) $(COPY_FILES_GPG)
|
||||||
for F in $(COPY_FILES) $(COPY_FILES_GPG) ; do if [ $$F -nt $@ ]; then echo $F ; fi ; done
|
set -e ; for VERSION in $(PYTHON_VERSIONS); do \
|
||||||
for VERSION in $(PYTHON_VERSIONS); do \
|
$(MKDIR_P) python$${VERSION}-gpg/gpg ; \
|
||||||
$(MKDIR_P) python$${VERSION}-gpg/gpg && \
|
cp -R $(COPY_FILES) python$${VERSION}-gpg ; \
|
||||||
cp -R $(COPY_FILES) python$${VERSION}-gpg && \
|
cp setup.py python$${VERSION}-gpg ; \
|
||||||
cp setup.py python$${VERSION}-gpg && \
|
cp gpg/version.py python$${VERSION}-gpg/gpg ; \
|
||||||
cp gpg/version.py python$${VERSION}-gpg/gpg && \
|
ln -sf "$(abs_top_srcdir)/src/data.h" python$${VERSION}-gpg ; \
|
||||||
ln -sf "$(abs_top_srcdir)/src/data.h" python$${VERSION}-gpg && \
|
ln -sf "$(abs_top_builddir)/config.h" python$${VERSION}-gpg ; \
|
||||||
ln -sf "$(abs_top_builddir)/config.h" python$${VERSION}-gpg && \
|
|
||||||
cp -R $(COPY_FILES_GPG) python$${VERSION}-gpg/gpg ; \
|
cp -R $(COPY_FILES_GPG) python$${VERSION}-gpg/gpg ; \
|
||||||
done
|
done
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
all-local: copystamp
|
all-local: copystamp
|
||||||
set $(PYTHONS); for VERSION in $(PYTHON_VERSIONS); do \
|
set -e ; set $(PYTHONS); for VERSION in $(PYTHON_VERSIONS); do \
|
||||||
PYTHON="$$1" ; shift ; \
|
PYTHON="$$1" ; shift ; \
|
||||||
cd python$${VERSION}-gpg && \
|
cd python$${VERSION}-gpg && \
|
||||||
CFLAGS="$(CFLAGS)" \
|
CFLAGS="$(CFLAGS)" \
|
||||||
@ -102,9 +101,9 @@ clean-local:
|
|||||||
|
|
||||||
install-exec-local:
|
install-exec-local:
|
||||||
rm -f install_files.txt
|
rm -f install_files.txt
|
||||||
set $(PYTHONS); for VERSION in $(PYTHON_VERSIONS); do \
|
set -e ; set $(PYTHONS); for VERSION in $(PYTHON_VERSIONS); do \
|
||||||
PYTHON="$$1" ; shift ; \
|
PYTHON="$$1" ; shift ; \
|
||||||
cd python$${VERSION}-gpg && \
|
cd python$${VERSION}-gpg ; \
|
||||||
$$PYTHON setup.py install \
|
$$PYTHON setup.py install \
|
||||||
--prefix $(DESTDIR)$(prefix) \
|
--prefix $(DESTDIR)$(prefix) \
|
||||||
--record files.txt \
|
--record files.txt \
|
||||||
|
Loading…
Reference in New Issue
Block a user