Commit fc2394a7 authored by Raphael 'kena' Poss's avatar Raphael 'kena' Poss
Browse files

Place the configure script at the top of the source tree.

This is important to limit user confusion. In a use case as
follows:

   cd sac2c
   ./configure --prefix=../inst

The intention of the user is to set the prefix to sac2c/../inst.
However prior to this patch "configure" is really run from sac2c/setup,
so the argument really sets the prefix to sac2c/setup/../inst, which is
confusing.

This patch fixes that issue by making sure the real "configure" script
resides at the top of the source tree. The other aspects of the
configuration remain unchanged.
Showing with 7623 additions and 7639 deletions
+7623 -7639
......@@ -8,9 +8,9 @@ src/bin/*
.revision.txt
include/sac.h
sac2crc
setup/autom4te.cache/
setup/config.log
setup/config.status
autom4te.cache/
config.log
config.status
setup/sac2crc
src/doc/ast.html
src/doc/ast.png
......
......@@ -229,8 +229,7 @@ tools: checks
#
config:
@ cd setup && \
autoreconf -v -f -i -I config
autoreconf -v -f -i -I setup/config
###############################################################################
#
......
This diff is collapsed.
......@@ -8,15 +8,15 @@ dnl parameters: package name, version, where to send bugreports
AC_INIT(sac2c, git, info@sac-home.org)
dnl set source directory and scripting directory
AC_CONFIG_SRCDIR(.)
AC_CONFIG_AUX_DIR(./config)
AC_CONFIG_SRCDIR([setup])
AC_CONFIG_AUX_DIR([setup/config])
dnl we use C as our compiler language
AC_LANG(C)
dnl and which files to create
AC_CONFIG_FILES(../src/makefiles/config.mkf sac2crc)
AC_CONFIG_HEADER(../src/include/config.h)
AC_CONFIG_FILES([src/makefiles/config.mkf setup/sac2crc])
AC_CONFIG_HEADER([src/include/config.h])
dnl check for host type
AC_CANONICAL_BUILD
......@@ -246,10 +246,10 @@ AC_SUBST_FILE([RCSUN])
AC_SUBST_FILE([RCX86])
AC_SUBST_FILE([RCALPHA])
AC_SUBST_FILE([RCMAC])
RCSUN=./sac2crc.SUN
RCX86=./sac2crc.X86
RCALPHA=./sac2crc.ALPHA
RCMAC=./sac2crc.MAC
RCSUN=setup/sac2crc.SUN
RCX86=setup/sac2crc.X86
RCALPHA=setup/sac2crc.ALPHA
RCMAC=setup/sac2crc.MAC
# generate specific flags for known os
......
This diff is collapsed.
......@@ -18,7 +18,7 @@ CONFIGURED := $(PROJECT_ROOT)/src/makefiles/config.mkf \
AUTOHEADERED := $(PROJECT_ROOT)/src/include/config.h.in
AUTOCONFED := $(PROJECT_ROOT)/setup/configure
AUTOCONFED := $(PROJECT_ROOT)/configure
#######################################################################################
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment