grab libiberty from other location

2 files changed, 17 insertions, 17 deletions

diff --git a/gnu/usr.bin/gcc/gcc/Makefile.in b/gnu/usr.bin/gcc/gcc/Makefile.in
index 67076d30c76..492771d4ad0 100644
--- a/gnu/usr.bin/gcc/gcc/Makefile.in
+++ b/gnu/usr.bin/gcc/gcc/Makefile.in
@@ -33,6 +33,7 @@ all:
 # Directory where sources are, from where we are.
 srcdir = @srcdir@
 VPATH = @srcdir@
+LIBIBERTY_INCLUDES=$(srcdir)/../include/
 
 # Pointer to the GCC Project website
 website=http://gcc.gnu.org
@@ -253,11 +254,11 @@ NM_FOR_TARGET = ` \
   fi`
 
 # Where to find some libiberty headers.
-HASHTAB_H   = $(srcdir)/../include/hashtab.h
-OBSTACK_H   = $(srcdir)/../include/obstack.h
-SPLAY_TREE_H= $(srcdir)/../include/splay-tree.h
-FIBHEAP_H   = $(srcdir)/../include/fibheap.h
-PARTITION_H = $(srcdir)/../include/partition.h
+HASHTAB_H   = $(LIBIBERTY_INCLUDES)/hashtab.h
+OBSTACK_H   = $(LIBIBERTY_INCLUDES)/obstack.h
+SPLAY_TREE_H= $(LIBIBERTY_INCLUDES)/splay-tree.h
+FIBHEAP_H   = $(LIBIBERTY_INCLUDES)/fibheap.h
+PARTITION_H = $(LIBIBERTY_INCLUDES)/partition.h
 
 # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
 NATIVE_SYSTEM_HEADER_DIR = /usr/include
@@ -588,7 +589,7 @@ TIMEVAR_H = timevar.h timevar.def
 INSN_ATTR_H = insn-attr.h $(srcdir)/insn-addr.h $(srcdir)/varray.h
 C_COMMON_H = c-common.h $(SPLAY_TREE_H) $(CPPLIB_H)
 C_TREE_H = c-tree.h $(C_COMMON_H)
-SYSTEM_H = system.h hwint.h $(srcdir)/../include/libiberty.h
+SYSTEM_H = system.h hwint.h $(LIBIBERTY_INCLUDES)/libiberty.h
 PREDICT_H = predict.h predict.def
 CPPLIB_H = cpplib.h line-map.h
 
@@ -1177,14 +1178,13 @@ s-crt0:	$(CRT0_S) $(MCRT0_S) $(GCC_PASSES) $(CONFIG_H)
 
 c-errors.o: c-errors.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(C_TREE_H) flags.h \
     diagnostic.h $(TM_P_H)
-c-parse.o : $(srcdir)/c-parse.c $(CONFIG_H) $(TREE_H) $(GGC_H) intl.h \
+c-parse.o : c-parse.c $(CONFIG_H) $(TREE_H) $(GGC_H) intl.h \
     $(C_TREE_H) input.h flags.h $(SYSTEM_H) toplev.h output.h $(CPPLIB_H) \
     gt-c-parse.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-	       -c $(srcdir)/c-parse.c $(OUTPUT_OPTION)
+	       -c c-parse.c $(OUTPUT_OPTION)
 
-$(srcdir)/c-parse.c: $(srcdir)/c-parse.y
-	cd $(srcdir) && \
+c-parse.c: c-parse.y
 	if $(BISON) $(BISONFLAGS) -o c-p$$$$.c c-parse.y; then \
 	  test -f c-p$$$$.output && mv -f c-p$$$$.output c-parse.output ; \
 	  mv -f c-p$$$$.c c-parse.c ; \
@@ -1193,12 +1193,12 @@ $(srcdir)/c-parse.c: $(srcdir)/c-parse.y
 	  false ; \
 	fi
 
-$(srcdir)/c-parse.y: c-parse.in
+c-parse.y: $(srcdir)/c-parse.in
 	echo '/*WARNING: This file is automatically generated!*/' >tmp-c-parse.y
 	sed -e "/^ifobjc$$/,/^end ifobjc$$/d" \
 	  -e "/^ifc$$/d" -e "/^end ifc$$/d" \
 	  $(srcdir)/c-parse.in >>tmp-c-parse.y
-	$(SHELL) $(srcdir)/move-if-change tmp-c-parse.y $(srcdir)/c-parse.y
+	$(SHELL) $(srcdir)/move-if-change tmp-c-parse.y c-parse.y
 
 c-decl.o : c-decl.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) $(C_TREE_H) \
     $(GGC_H) $(TARGET_H) flags.h function.h output.h $(EXPR_H) \
@@ -1489,7 +1489,7 @@ xcoffout.o : xcoffout.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) xcoffout.h \
    flags.h toplev.h output.h dbxout.h $(GGC_H) $(TARGET_H)
 emit-rtl.o : emit-rtl.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h \
    function.h $(REGS_H) insn-config.h $(RECOG_H) real.h $(GGC_H) \
-   $(EXPR_H) $(srcdir)/../include/obstack.h hard-reg-set.h bitmap.h toplev.h \
+   $(EXPR_H) $(OBSTACK_H) hard-reg-set.h bitmap.h toplev.h \
    $(HASHTAB_H) $(TM_P_H) debug.h langhooks.h
 real.o : real.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) toplev.h $(TM_P_H)
 integrate.o : integrate.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h \
diff --git a/gnu/usr.bin/gcc/gcc/configure b/gnu/usr.bin/gcc/gcc/configure
index 74b8a4fa608..36fe9647602 100755
--- a/gnu/usr.bin/gcc/gcc/configure
+++ b/gnu/usr.bin/gcc/gcc/configure
@@ -793,7 +793,7 @@ fi
 
 # Determine the host, build, and target systems
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+for ac_dir in ${GNUSYSTEM_AUX_DIR} $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -6708,7 +6708,7 @@ tm_file_list=
 for f in $tm_file; do
   case $f in
     ansidecl.h )
-       tm_file_list="${tm_file_list} \$(srcdir)/../include/ansidecl.h" ;;
+       tm_file_list="${tm_file_list} \$(LIBIBERTY_INCLUDES)/ansidecl.h" ;;
     defaults.h )
        tm_file_list="${tm_file_list} \$(srcdir)/$f" ;;
     *) tm_file_list="${tm_file_list} \$(srcdir)/config/$f" ;;
@@ -6724,7 +6724,7 @@ host_xm_file_list=
 for f in $host_xm_file; do
   case $f in
     ansidecl.h )
-       host_xm_file_list="${host_xm_file_list} \$(srcdir)/../include/ansidecl.h" ;;
+       host_xm_file_list="${host_xm_file_list} \$(LIBIBERTY_INCLUDES)/ansidecl.h" ;;
     auto-host.h )
        host_xm_file_list="${host_xm_file_list} $f" ;;
     defaults.h )
@@ -6737,7 +6737,7 @@ build_xm_file_list=
 for f in $build_xm_file; do
   case $f in
     ansidecl.h )
-       build_xm_file_list="${build_xm_file_list} \$(srcdir)/../include/ansidecl.h" ;;
+       build_xm_file_list="${build_xm_file_list} \$(LIBIBERTY_INCLUDES)/ansidecl.h" ;;
     auto-build.h | auto-host.h )
        build_xm_file_list="${build_xm_file_list} $f" ;;
     defaults.h )