Stop forcing LC_CTYPE=ISO-8859-1

[bup.git] / Makefile

diff --git a/Makefile b/Makefile
index 42cbbcd8b2142a662e64a0b5fcbc142663e1dabe..7dd7cdfa77d7d362c4c69803fefa844cd9fae553 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,21 @@ config/config.vars: configure config/configure config/configure.inc \
   $(wildcard config/*.in)
        MAKE="$(MAKE)" ./configure
 
+# On some platforms, Python.h and readline.h fight over the
+# _XOPEN_SOURCE version, i.e. -Werror crashes on a mismatch, so for
+# now, we're just going to let Python's version win.
+readline_cflags += $(shell pkg-config readline --cflags)
+readline_xopen := $(filter -D_XOPEN_SOURCE=%,$(readline_cflags))
+readline_xopen := $(subst -D_XOPEN_SOURCE=,,$(readline_xopen))
+ifneq ($(readline_xopen),600)
+  $(error "Unexpected pkg-config readline _XOPEN_SOURCE --cflags $(readline_cflags)")
+endif
+readline_cflags := $(filter-out -D_XOPEN_SOURCE=%,$(readline_cflags))
+readline_cflags += $(addprefix -DBUP_RL_EXPECTED_XOPEN_SOURCE=,$(readline_xopen))
+
+CFLAGS += $(readline_cflags)
+LDFLAGS += $(shell pkg-config readline --libs)
+
 bup_cmds := cmd/bup-python \
   $(patsubst cmd/%-cmd.py,cmd/bup-%,$(wildcard cmd/*-cmd.py)) \
   $(patsubst cmd/%-cmd.sh,cmd/bup-%,$(wildcard cmd/*-cmd.sh))
@@ -57,15 +72,6 @@ all: $(bup_deps) Documentation/all $(current_sampledata)
 $(current_sampledata):
        t/configure-sampledata --setup
 
-
-bup_libdir="$script_home/../lib"  # bup_libdir will be adjusted during install
-
-define install-bup-python
-  set -e; \
-  sed -e 's|.*# bup_libdir will be adjusted during install|bup_libdir="$$script_home/.."|' $1 > $2; \
-  chmod 0755 $2;
-endef
-
 PANDOC ?= $(shell type -p pandoc)
 
 ifeq (,$(PANDOC))
@@ -98,9 +104,11 @@ install: all
        test -z "$(man_roff)" || $(INSTALL) -m 0644 $(man_roff) $(dest_mandir)/man1
        test -z "$(man_html)" || install -d $(dest_docdir)
        test -z "$(man_html)" || $(INSTALL) -m 0644 $(man_html) $(dest_docdir)
-       $(INSTALL) -pm 0755 cmd/bup $(dest_libdir)/cmd/
-       $(INSTALL) -pm 0755 cmd/bup-* $(dest_libdir)/cmd/
-       $(call install-bup-python,cmd/bup-python,"$(dest_libdir)/cmd/bup-python")
+       dev/install-python-script lib/cmd/bup "$(dest_libdir)/cmd/bup"
+       set -e; \
+       for cmd in $$(ls cmd/bup-* | grep -v cmd/bup-python); do \
+         dev/install-python-script "$$cmd" "$(dest_libdir)/$$cmd"; \
+       done
        cd "$(dest_bindir)" && \
          ln -sf "$$($(bup_python) -c 'import os; print(os.path.relpath("$(abspath $(dest_libdir))/cmd/bup"))')"
        set -e; \
@@ -123,8 +131,7 @@ lib/bup/_helpers$(SOEXT): \
                config/config.h lib/bup/bupsplit.h \
                lib/bup/bupsplit.c lib/bup/_helpers.c lib/bup/csetup.py
        @rm -f $@
-       cd lib/bup && \
-       LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" "$(bup_python)" csetup.py build
+       cd lib/bup && $(bup_python) csetup.py build "$(CFLAGS)" "$(LDFLAGS)"
         # Make sure there's just the one file we expect before we copy it.
        "$(bup_python)" -c \
          "import glob; assert(len(glob.glob('lib/bup/build/*/_helpers*$(SOEXT)')) == 1)"
@@ -177,6 +184,7 @@ cmdline_tests := \
   t/test-fsck.sh \
   t/test-fuse.sh \
   t/test-ftp \
+  t/test-web.sh \
   t/test-gc.sh \
   t/test-import-duplicity.sh \
   t/test-import-rdiff-backup.sh \
@@ -207,13 +215,6 @@ cmdline_tests := \
   t/test-tz.sh \
   t/test-xdev.sh
 
-ifeq "2" "$(bup_python_majver)"
-  # unresolved
-  #   web: needs more careful attention, path bytes round-trips, reprs, etc.
-  cmdline_tests += \
-    t/test-web.sh
-endif
-
 tmp-target-run-test-get-%: all t/tmp
        $(pf); cd $$(pwd -P); TMPDIR="$(test_tmp)" \
          t/test-get $* 2>&1 | tee -a t/tmp/test-log/$$$$.log
@@ -252,12 +253,8 @@ check: test
 distcheck: all
        ./wvtest run t/test-release-archive.sh
 
-cmd/bup-python: cmd/python-cmd.sh config/config.var/bup-python
-       "$$(cat config/config.var/bup-python)" dev/replace -l '@bup_python@' \
-         "$$(dev/shquote < config/config.var/bup-python)" \
-         < "$<" > "$@".$$PPID.tmp
-       chmod +x "$@".$$PPID.tmp
-       mv "$@".$$PPID.tmp "$@"
+cmd/bup-python: config/config.var/bup-python
+       cd cmd && ln -sf "$$(< $(CURDIR)/config/config.var/bup-python)" bup-python
 
 long-test: export BUP_TEST_LEVEL=11
 long-test: test