diff -Naur tmp-old/g95-0.50/Makefile.in tmp-new/g95-0.50/Makefile.in --- Makefile.in 2006-06-08 14:37:59.000000000 +0000 +++ Makefile.in 2006-06-09 07:33:16.000000000 +0000 @@ -131,6 +131,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +docdir = $(prefix)/share/doc/g95-0.50 @GCC_TRUE@bin_PROGRAMS = g95 @@ -2539,9 +2540,9 @@ all-am: Makefile $(PROGRAMS) $(DATA) g95-config.h installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(extradir) $(DESTDIR)$(g95dir) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(extradir) $(DESTDIR)$(g95dir) $(DESTDIR)$(docdir) -install: install-am +install: installdirs install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -2648,30 +2649,31 @@ rm -f options.tmp options.c options.h version.c install-exec-hook: - mv $(bindir)/g95$(EXEEXT) $(bindir)/$(host)-g95$(EXEEXT) + mv $(DESTDIR)$(bindir)/g95$(EXEEXT) $(DESTDIR)$(bindir)/$(host)-g95$(EXEEXT) + ln -s $(host)-g95$(EXEEXT) $(DESTDIR)$(bindir)/g95$(EXEEXT) install-data-hook: - -ln -sf f951$(EXEEXT) @DEST_LIBDIR@/cc1 + -ln -sf f951$(EXEEXT) $(DESTDIR)@DEST_LIBDIR@/cc1 if test "`uname`" = "Darwin" ; then \ ar x /usr/lib/libgcc.a darwin-fpsave.o ; \ - ar rs @DEST_LIBDIR@/libgcc.a darwin-fpsave.o ; \ + ar rs $(DESTDIR)@DEST_LIBDIR@/libgcc.a darwin-fpsave.o ; \ rm ./darwin-fpsave.o ; \ - ranlib @DEST_LIBDIR@/libgcc_eh.a ; \ - ranlib @DEST_LIBDIR@/libgcc.a ; \ + ranlib $(DESTDIR)@DEST_LIBDIR@/libgcc_eh.a ; \ + ranlib $(DESTDIR)@DEST_LIBDIR@/libgcc.a ; \ fi - cp INSTALL @DEST_LIBDIR@/../../../.. - cp G95Manual.pdf @DEST_LIBDIR@/../../../.. + cp INSTALL $(DESTDIR)$(docdir)/ + cp G95Manual.pdf $(DESTDIR)$(docdir)/ if test -n "`ls @GCC_DIR@/g95/gcc/libgcc_s.*`" ; then \ (cd @GCC_DIR@/g95/gcc; tar cf - libgcc_s.*) | \ - (cd @DEST_LIBDIR@; tar xf -) ; \ + (cd $(DESTDIR)@DEST_LIBDIR@; tar xf -) ; \ fi if test -n "`ls @GCC_DIR@/g95/gcc/libunwind.*`" ; then \ (cd @GCC_DIR@/g95/gcc; tar cf - libunwind.*) | \ - (cd @DEST_LIBDIR@; tar xf -) ; \ + (cd $(DESTDIR)@DEST_LIBDIR@; tar xf -) ; \ fi if test -n "`ls @GCC_DIR@/g95/gcc/libgcc_eh.*`" ; then \ (cd @GCC_DIR@/g95/gcc; tar cf - libgcc_eh.*) | \ - (cd @DEST_LIBDIR@; tar xf -) ; \ + (cd $(DESTDIR)@DEST_LIBDIR@; tar xf -) ; \ fi ggc-page.o: ggc-page40.c ggc-page41.c