* Makefile.in, Makefile.in (bindir, libdir, datadir, mandir, infodir,

[binutils.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2bbd05ea002d620e2e288ac455c67035f4e44139..8766df2c7aa5e9fc0ad5e0e3a30417bf8b9200bf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,7 @@ tooldir = $(exec_prefix)/$(target)
 
 program_transform_name =
 
-datadir = $(prefix)/lib
+datadir = $(prefix)/share
 mandir = $(prefix)/man
 man1dir = $(mandir)/man1
 man2dir = $(mandir)/man2
@@ -142,7 +142,8 @@ OTHERS =
 TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup
 
 # Target libraries are put under this directory:
-TARGET_SUBDIR = . # Changed by configure to $(target_alias) if cross.
+# Changed by configure to $(target_alias) if cross.
+TARGET_SUBDIR = .
 
 # This is set by the configure script to the arguments passed to configure.
 CONFIG_ARGUMENTS = 
@@ -908,6 +909,11 @@ install.all: install-no-fixedincludes
                true ; \
        fi
 
+# inet-install is used because the I*Net wants DejaGNU installed but
+# not built.
+inet-install:
+       $(MAKE) INSTALL_MODULES="`echo $(INSTALL_MODULES) | sed -e 's/install-dejagnu//'`" install
+
 # install-no-fixedincludes is used because Cygnus can not distribute
 # the fixed header files.
 .PHONY: install-no-fixedincludes
@@ -1261,7 +1267,7 @@ all-guile:
 all-gzip: all-libiberty
 all-hello: all-libiberty
 all-indent:
-all-inet: all-tcl all-send-pr
+all-inet: all-tcl all-send-pr all-perl
 all-ispell: all-emacs19
 all-ld: all-libiberty all-bfd all-opcodes all-byacc all-flex
 configure-target-libg++: $(ALL_GCC) configure-target-librx
@@ -1312,9 +1318,7 @@ install-target: $(INSTALL_TARGET_MODULES)
 
 MAKEDIRS= \
        $(prefix) \
-       $(exec_prefix) \
-       $(tooldir)
-
+       $(exec_prefix)
 .PHONY: install-dirs
 install-dirs:
        @for i in $(MAKEDIRS) ; do \
@@ -1442,10 +1446,13 @@ taz: $(DEVO_SUPPORT) $(SUPPORT_FILES) \
            <configure.in >proto-toplev/configure.in
        #
        mkdir proto-toplev/texinfo
-       ln -s ../../texinfo/texinfo.tex proto-toplev/texinfo/
-       ln -s ../../texinfo/gpl.texinfo proto-toplev/texinfo/
-       ln -s ../../texinfo/lgpl.texinfo proto-toplev/texinfo/
-       ln -s ../../texinfo/tex3patch   proto-toplev/texinfo/
+       ln -s ../../texinfo/texinfo.tex         proto-toplev/texinfo/
+       ln -s ../../texinfo/gpl.texinfo         proto-toplev/texinfo/
+       ln -s ../../texinfo/lgpl.texinfo        proto-toplev/texinfo/
+       if test -r texinfo/util/tex3patch ; then \
+         mkdir proto-toplev/texinfo/util && \
+         ln -s ../../../texinfo/util/tex3patch proto-toplev/texinfo/util ; \
+       else true; fi
        chmod og=u `find . -print`
        (VER=`sed <$(TOOL)/Makefile.in -n 's/^VERSION *= *//p'`; \
                echo "==> Making $(TOOL)-$$VER.tar.gz"; \