diff options
| -rw-r--r-- | Makefile.in | 24 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| m--------- | deps/attoconf | 0 |
3 files changed, 24 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 320fca8..9f02a8f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -5,7 +5,8 @@ PACKAGE = @PACKAGE@ PACKAGE_NAME = @PACKAGE_NAME@ PREFIX = @PREFIX@ -EPREFIX = @EPREFIX@ +EPREFIX = @EXEC_PREFIX@ +# EPREFIX = @EPREFIX@ BINDIR = @BINDIR@ SBINDIR = @SBINDIR@ @@ -29,12 +30,15 @@ PDFDIR = @PDFDIR@ PSDIR = @PSDIR@ DEBUGDIR = @DEBUGDIR@ +BUILD = @BUILD@ +HOST = @HOST@ BISON = @BISON@ FLEX = @FLEX@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ -LDLIBS = @LDLIBS@ +LDLIBS = @LIBS@ +# LDLIBS = @LDLIBS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ GTEST_DIR = @GTEST_DIR@ @@ -450,8 +454,24 @@ dist/%-attoconf-only.tar: dist/%-bundled.tar: dist/%-src.tar dist/%-attoconf-only.tar cp dist/$*-src.tar $@ tar Af $@ dist/$*-attoconf-only.tar +dist/%-bin-${HOST}.tar: all + ${MAKE} install DESTDIR=$(abspath dist/$*) + tar cf $@ -C dist $* dist: dist/tmwa-${VERSION_FULL}-src.tar dist/tmwa-${VERSION_FULL}-bundled.tar +ifneq '' '${HOST}' +bindist: dist/tmwa-${VERSION_FULL}-bin-${HOST}.tar +else +bindist: + @echo + @echo + @echo "Fatal Error: 'make bindist' requires './configure --host='." + @echo "Maybe you want `${CXX} -v 2>&1 | sed -n '/Target: /{s///;p}'`, but I refuse to guess," + @echo "because there are too many options like -m32 that confuse me." + @echo + @echo + @false +endif .PHONY: dist format: format-cpp format-hpp @@ -28,7 +28,7 @@ except ImportError: sys.exit('attoconf missing - please run: git submodule update --init') else: try: - require_version(0, 8) + require_version(0, 9) except SystemExit as e: e.code += '\nPlease run: git submodule update' raise @@ -58,7 +58,7 @@ class Configuration(Cxx, Flex, Bison, Install, ConfigHash, Templates): def paths(self): super(Configuration, self).paths() - self.add_option('--debugdir', init='/', + self.add_option('--debugdir', init='/.', type=filepath, check=lambda build, DIR: None, help='root for split debug files (often /usr/lib/debug)', hidden=False, help_var='DIR') diff --git a/deps/attoconf b/deps/attoconf -Subproject 0f0e6300534b8b847f139c04b9e6ed1cc1100d9 +Subproject 9d681429a3c78520614be1f4852de8ffb1bfcd8 |