diff options
| author | lloyd <[email protected]> | 2007-03-04 08:46:14 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2007-03-04 08:46:14 +0000 |
| commit | 2c8dd4223a9fb5bcf8e68778137e3f40d1c5dd1d (patch) | |
| tree | a6d54352525c61ed69c0cfcdc2ce9cf9dbb7f70d /misc | |
| parent | d6debeaec24f7e1002fd77392bc82d25611d933b (diff) | |
Handle out of tree builds a little better.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/config/cc/gcc | 2 | ||||
| -rw-r--r-- | misc/config/makefile/unix.in | 6 | ||||
| -rw-r--r-- | misc/config/makefile/unix_shr.in | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/misc/config/cc/gcc b/misc/config/cc/gcc index 0088f6758..1485037c2 100644 --- a/misc/config/cc/gcc +++ b/misc/config/cc/gcc @@ -34,7 +34,7 @@ beos -> "ld -shared -h $(SONAME)" <mach_opt> # Specializations first (they don't need to be, just clearer) -i386 -> "-mcpu=i686 -momit-leaf-frame-pointer" +i386 -> "-mtune=i686 -momit-leaf-frame-pointer" r10000 -> "-mips4" alpha-ev67 -> "-mcpu=ev6" # FIXME: GCC 3.1 and on has -march=ev67 alpha-ev68 -> "-mcpu=ev6" diff --git a/misc/config/makefile/unix.in b/misc/config/makefile/unix.in index a4342da00..60f2dc57c 100644 --- a/misc/config/makefile/unix.in +++ b/misc/config/makefile/unix.in @@ -31,7 +31,7 @@ DOCDIR = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION) OWNER = @{var:install_user} GROUP = @{var:install_group} -CONFIG_SCRIPT = botan-config +CONFIG_SCRIPT = @{var:botan_config} ################################################## # Aliases for Common Programs # @@ -51,7 +51,7 @@ RM_R = @rm -rf ################################################## # File Lists # ################################################## -CHECK = check +CHECK = @{var:check_prefix}check DOCS = @{var:doc_files} @@ -66,7 +66,7 @@ CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) LIBRARIES = $(STATIC_LIB) -LIBNAME = libbotan +LIBNAME = @{var:lib_prefix}libbotan STATIC_LIB = $(LIBNAME).a all: $(LIBRARIES) diff --git a/misc/config/makefile/unix_shr.in b/misc/config/makefile/unix_shr.in index fc85f4ad3..9d9b70a99 100644 --- a/misc/config/makefile/unix_shr.in +++ b/misc/config/makefile/unix_shr.in @@ -33,7 +33,7 @@ DOCDIR = $(INSTALLROOT)/@{var:docdir}/Botan-$(VERSION) OWNER = @{var:install_user} GROUP = @{var:install_group} -CONFIG_SCRIPT = botan-config +CONFIG_SCRIPT = @{var:botan-config} ################################################## # Aliases for Common Programs # @@ -53,7 +53,7 @@ RM_R = @rm -rf ################################################## # File Lists # ################################################## -CHECK = check +CHECK = @{var:check_prefix}check DOCS = @{var:doc_files} @@ -68,13 +68,13 @@ CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) LIBRARIES = $(STATIC_LIB) $(SHARED_LIB) -LIBNAME = libbotan +LIBNAME = @{var:lib_prefix}libbotan STATIC_LIB = $(LIBNAME).a SHARED_LIB = $(LIBNAME)-$(MAJOR).$(MINOR).$(PATCH).@{var:so_suffix} SONAME = $(LIBNAME)-$(MAJOR).$(MINOR).$(PATCH).@{var:so_suffix} -SYMLINK = $(LIBNAME).@{var:so_suffix} +SYMLINK = libbotan.@{var:so_suffix} all: $(LIBRARIES) |