Attachment #567694 for bug #679340




#  along with GCC; see the file COPYING.  If not, write to the Free
#  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#  02111-1307, USA.
CC=@ac_tool_prefix@@CC@
CXX=@ac_tool_prefix@@CXX@
build=@build@
srcdir=@srcdir@
abs_srcdir=@abs_srcdir@
GNATMAKE=@ac_tool_prefix@@GNATMAKE@
MAKE=@MAKE@
prefix=@prefix@
backend=@backend@

PWD?=$(shell pwd)
DESTDIR=
bindir=$(prefix)/bin
libdir=@libdir@
incdir=$(prefix)/include
MKDIR=mkdir
LN=ln -s

SED=sed
GRT_RANLIB=ranlib

VHDL_LIB_DIR=$(libdir)/$(libdirsuffix)

ifeq "$(enable_checks)" "true"
 # Debug + checks

	$(MKDIR) -p $(DESTDIR)$(prefix)
	$(MKDIR) -p $(DESTDIR)$(bindir)
	$(MKDIR) -p $(DESTDIR)$(libdir)
	$(MKDIR) -p $(DESTDIR)$(libdir)/$(libdirsuffix)
	$(MKDIR) -p $(DESTDIR)$(incdir)

install.vhdllib: install.dirs




MAKE=${MAKE:-make}
LDFLAGS=
prefix=/usr/local
libdirsuffix=ghdl
libdirreverse=../..
gcc_src_dir=
llvm_config=

EXEEXT=
SOEXT=.so
PIC_FLAGS=-fPIC
ac_tool_prefix=
libdir=
# Unused parameters
mandir=
infodir=
datadir=
sysconfdir=
localstatedir=

show_help=no
progname=$0

subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie enable_werror enable_checks enable_openieee enable_python libghdl_version ghdl_version ac_tool_prefix libdir mandir infodir datadir sysconfdir localstatedir"

# Find srcdir
srcdir=`dirname $progname`

		--disable-python)       enable_python=false;;
		--enable-coverage)      build_mode="coverage";;
		-h|-help|--help)        show_help=yes;;
        --build=*)              build="$optarg";;
        --host=*)               host="$optarg";;
        --libdir=*)             libdir="$optarg";;
        # Unused parameters
        --mandir=*)             mandir="$optarg";;
        --infodir=*)            infodir="$optarg";;
        --datadir=*)            datadir="$optarg";;
        --sysconfdir=*)         sysconfdir="$optarg";;
        --localstatedir=*)      localstatedir="$optarg";;
		*)
			echo "$0: unknown option $opt; try $0 --help"
			exit 1

	esac
done

ac_tool_prefix=
test -n "$host_alias" && ac_tool_prefix=$host_alias-

if test "x$libdir" = "x"; then
    libdir=$prefix/lib
fi

# Help
if test $show_help != no; then
	cat <<EOF

		-e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
		-e "s%@POST_PROCESSOR@%oread-$backend%" \
		-e "s%@INSTALL_PREFIX@%$prefix%" \
		-e "s%@LIB_PREFIX@%$libdir/$libdirsuffix%" \
		-e "s%@SOEXT@%$SOEXT%" \
		-e "s%@default_pie@%$default_pie%" \
		< $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads

Lines 102-107 vhdl/default_paths.ads: Makefile Link Here

(-)a/dist/gcc/Make-lang.in (+1 lines)
102	echo " Compiler_Mcode : constant String := \"\";" >> tmp-dpaths.ads	102	echo " Compiler_Mcode : constant String := \"\";" >> tmp-dpaths.ads
103	echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpaths.ads	103	echo " Compiler_Llvm : constant String := \"\";" >> tmp-dpaths.ads
104	echo " Post_Processor : constant String := \"\";" >> tmp-dpaths.ads	104	echo " Post_Processor : constant String := \"\";" >> tmp-dpaths.ads
		105	# TODO: Fix this!!!
105	echo " Lib_Prefix : constant String :=">> tmp-dpaths.ads	106	echo " Lib_Prefix : constant String :=">> tmp-dpaths.ads
106	echo " \"lib/ghdl\";" >> tmp-dpaths.ads	107	echo " \"lib/ghdl\";" >> tmp-dpaths.ads
107	echo " Shared_Library_Extension : constant String :=">> tmp-dpaths.ads	108	echo " Shared_Library_Extension : constant String :=">> tmp-dpaths.ads

Return to bug 679340

Lines 15-26 Link Here

(-)a/Makefile.in (-6 / +6 lines)
15	# along with GCC; see the file COPYING. If not, write to the Free	15	# along with GCC; see the file COPYING. If not, write to the Free
16	# Software Foundation, 59 Temple Place - Suite 330, Boston, MA	16	# Software Foundation, 59 Temple Place - Suite 330, Boston, MA
17	# 02111-1307, USA.	17	# 02111-1307, USA.
18	CC=@CC@	18	CC=@ac_tool_prefix@@CC@
19	CXX=@CXX@	19	CXX=@ac_tool_prefix@@CXX@
20	build=@build@	20	build=@build@
21	srcdir=@srcdir@	21	srcdir=@srcdir@
22	abs_srcdir=@abs_srcdir@	22	abs_srcdir=@abs_srcdir@
23	GNATMAKE=@GNATMAKE@	23	GNATMAKE=@ac_tool_prefix@@GNATMAKE@
24	MAKE=@MAKE@	24	MAKE=@MAKE@
25	prefix=@prefix@	25	prefix=@prefix@
26	backend=@backend@	26	backend=@backend@
Lines 47-53 INSTALL_DATA=install -m 644 Link Here
47	PWD?=$(shell pwd)	47	PWD?=$(shell pwd)
48	DESTDIR=	48	DESTDIR=
49	bindir=$(prefix)/bin	49	bindir=$(prefix)/bin
50	libdir=$(prefix)/lib	50	libdir=@libdir@
51	incdir=$(prefix)/include	51	incdir=$(prefix)/include
52	MKDIR=mkdir	52	MKDIR=mkdir
53	LN=ln -s	53	LN=ln -s
Lines 56-62 MV=mv Link Here
56	SED=sed	56	SED=sed
57	GRT_RANLIB=ranlib	57	GRT_RANLIB=ranlib
58		58
59	VHDL_LIB_DIR=$(prefix)/$(libdirsuffix)	59	VHDL_LIB_DIR=$(libdir)/$(libdirsuffix)
60		60
61	ifeq "$(enable_checks)" "true"	61	ifeq "$(enable_checks)" "true"
62	# Debug + checks	62	# Debug + checks
Lines 448-454 install.dirs: Link Here
448	$(MKDIR) -p $(DESTDIR)$(prefix)	448	$(MKDIR) -p $(DESTDIR)$(prefix)
449	$(MKDIR) -p $(DESTDIR)$(bindir)	449	$(MKDIR) -p $(DESTDIR)$(bindir)
450	$(MKDIR) -p $(DESTDIR)$(libdir)	450	$(MKDIR) -p $(DESTDIR)$(libdir)
451	$(MKDIR) -p $(DESTDIR)$(prefix)/$(libdirsuffix)	451	$(MKDIR) -p $(DESTDIR)$(libdir)/$(libdirsuffix)
452	$(MKDIR) -p $(DESTDIR)$(incdir)	452	$(MKDIR) -p $(DESTDIR)$(incdir)
453		453
454	install.vhdllib: install.dirs	454	install.vhdllib: install.dirs

Lines 33-39 GNATMAKE=${GNATMAKE:-gnatmake} Link Here

(-)a/configure (-3 / +27 lines)
33	MAKE=${MAKE:-make}	33	MAKE=${MAKE:-make}
34	LDFLAGS=	34	LDFLAGS=
35	prefix=/usr/local	35	prefix=/usr/local
36	libdirsuffix=lib/ghdl	36	libdirsuffix=ghdl
37	libdirreverse=../..	37	libdirreverse=../..
38	gcc_src_dir=	38	gcc_src_dir=
39	llvm_config=	39	llvm_config=
Lines 48-58 enable_python=false Link Here
48	EXEEXT=	48	EXEEXT=
49	SOEXT=.so	49	SOEXT=.so
50	PIC_FLAGS=-fPIC	50	PIC_FLAGS=-fPIC
		51	ac_tool_prefix=
		52	libdir=
		53	# Unused parameters
		54	mandir=
		55	infodir=
		56	datadir=
		57	sysconfdir=
		58	localstatedir=
51		59
52	show_help=no	60	show_help=no
53	progname=$0	61	progname=$0
54		62
55	subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie enable_werror enable_checks enable_openieee enable_python libghdl_version ghdl_version"	63	subst_vars="CC CXX GNATMAKE MAKE CFLAGS LDFLAGS build srcdir abs_srcdir prefix backend libdirsuffix libdirreverse gcc_src_dir llvm_config llvm_be backtrace_lib build_mode EXEEXT SOEXT PIC_FLAGS default_pie enable_werror enable_checks enable_openieee enable_python libghdl_version ghdl_version ac_tool_prefix libdir mandir infodir datadir sysconfdir localstatedir"
56		64
57	# Find srcdir	65	# Find srcdir
58	srcdir=`dirname $progname`	66	srcdir=`dirname $progname`
Lines 108-113 for opt do Link Here
108	--disable-python) enable_python=false;;	116	--disable-python) enable_python=false;;
109	--enable-coverage) build_mode="coverage";;	117	--enable-coverage) build_mode="coverage";;
110	-h\|-help\|--help) show_help=yes;;	118	-h\|-help\|--help) show_help=yes;;
		119	--build=*) build="$optarg";;
		120	--host=*) host="$optarg";;
		121	--libdir=*) libdir="$optarg";;
		122	# Unused parameters
		123	--mandir=*) mandir="$optarg";;
		124	--infodir=*) infodir="$optarg";;
		125	--datadir=*) datadir="$optarg";;
		126	--sysconfdir=*) sysconfdir="$optarg";;
		127	--localstatedir=*) localstatedir="$optarg";;
111	*)	128	*)
112	echo "$0: unknown option $opt; try $0 --help"	129	echo "$0: unknown option $opt; try $0 --help"
113	exit 1	130	exit 1
Lines 115-120 for opt do Link Here
115	esac	132	esac
116	done	133	done
117		134
		135	ac_tool_prefix=
		136	test -n "$host_alias" && ac_tool_prefix=$host_alias-
		137
		138	if test "x$libdir" = "x"; then
		139	libdir=$prefix/lib
		140	fi
		141
118	# Help	142	# Help
119	if test $show_help != no; then	143	if test $show_help != no; then
120	cat <<EOF	144	cat <<EOF
Lines 371-377 sed -e "s%@COMPILER_GCC@%ghdl1-gcc$EXEEXT%" \ Link Here
371	-e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \	395	-e "s%@COMPILER_LLVM@%ghdl1-llvm$EXEEXT%" \
372	-e "s%@POST_PROCESSOR@%oread-$backend%" \	396	-e "s%@POST_PROCESSOR@%oread-$backend%" \
373	-e "s%@INSTALL_PREFIX@%$prefix%" \	397	-e "s%@INSTALL_PREFIX@%$prefix%" \
374	-e "s%@LIB_PREFIX@%$libdirsuffix%" \	398	-e "s%@LIB_PREFIX@%$libdir/$libdirsuffix%" \
375	-e "s%@SOEXT@%$SOEXT%" \	399	-e "s%@SOEXT@%$SOEXT%" \
376	-e "s%@default_pie@%$default_pie%" \	400	-e "s%@default_pie@%$default_pie%" \
377	< $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads	401	< $srcdir/src/ghdldrv/default_paths.ads.in > default_paths.ads