new install theme

diff --git a/Makefile.in b/Makefile.in
index 6ca84ae27fa01a7ee24b742c7decbb00be16dad6..828350f1074113ccef062ccda5547ae73c43bdae 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,12 +16,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #
-# Last Mod Tue Oct 22 22:40:07 PDT 1991, by rich@cygnus.com
+# Last Mod Thu Oct 31 02:58:25 PST 1991, by rich@rtl.cygnus.com
 #
 # $Id$
 
 srcdir = .
-destdir = /usr/local
+
+idestdir = /usr/local
+ddestdir = $(idestdir)
 
 SHELL=/bin/sh
 
@@ -156,27 +158,27 @@ install: install-dirs install-fixed-includes
 # of the "if" command, if no commands are run in the "then" or "else" part,
 # causing Make to quit.
 install-dirs: force
-       - mkdir $(destdir)
-       - mkdir $(destdir)/include
-       - mkdir $(destdir)/H-$(host_alias)
-       - mkdir $(destdir)/H-$(host_alias)/T-independent
-       - mkdir $(destdir)/H-$(host_alias)/T-independent/bin
-       - mkdir $(destdir)/H-$(host_alias)/T-independent/lib
-       - mkdir $(destdir)/H-$(host_alias)/T-$(target_alias)
-       - mkdir $(destdir)/H-$(host_alias)/T-$(target_alias)/bin
-       - mkdir $(destdir)/H-$(host_alias)/T-$(target_alias)/lib
-       - mkdir $(destdir)/H-independent
-       - mkdir $(destdir)/H-independent/include
-       - mkdir $(destdir)/H-independent/doc
-       - mkdir $(destdir)/H-independent/man
-       - mkdir $(destdir)/H-independent/man/man1
-       - mkdir $(destdir)/H-independent/man/man2
-       - mkdir $(destdir)/H-independent/man/man3
-       - mkdir $(destdir)/H-independent/man/man4
-       - mkdir $(destdir)/H-independent/man/man5
-       - mkdir $(destdir)/H-independent/man/man6
-       - mkdir $(destdir)/H-independent/man/man7
-       - mkdir $(destdir)/H-independent/man/man8
+       - mkdir $(ddestdir)
+       - mkdir $(ddestdir)/include
+       - mkdir $(ddestdir)/lib
+       - mkdir $(ddestdir)/lib/emacs
+       - mkdir $(ddestdir)/bin
+       - mkdir $(ddestdir)/lib
+       - mkdir $(ddestdir)
+       - mkdir $(ddestdir)/bin
+       - mkdir $(ddestdir)/lib
+       - mkdir $(idestdir)
+       - mkdir $(idestdir)include
+       - mkdir $(idestdir)/doc
+       - mkdir $(idestdir)/man
+       - mkdir $(idestdir)/man/man1
+       - mkdir $(idestdir)/man/man2
+       - mkdir $(idestdir)/man/man3
+       - mkdir $(idestdir)/man/man4
+       - mkdir $(idestdir)/man/man5
+       - mkdir $(idestdir)/man/man6
+       - mkdir $(idestdir)/man/man7
+       - mkdir $(idestdir)/man/man8
        if [ -d $(unsubdir)/gcc`if [ -d $(unsubdir)/gcc.$(target) ] ; \
                 then echo .$(target) ; fi`$(subdir) ] ; then \
                (cd  $(unsubdir)/gcc`if [ -d $(unsubdir)/gcc.$(target) ] ; \

diff --git a/configure b/configure
index 325541206094c0e61621805321f7ae0b1b2935b3..092f3147a3dcada470528eba514533120c8c02d9 100755 (executable)
--- a/configure
+++ b/configure
@@ -54,10 +54,12 @@ ansi=
 arguments=$*
 commontargets=
 configdirs=
+ddestdir=
 defaulttargets=
 destdir=
 fatal=
 hostsubdir=
+idestdir=
 norecursion=
 objdir=
 objdiroption=
@@ -78,13 +80,13 @@ do
                ansi=true
                clib=clib
                ;;
-       -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=* | +d=*)
-               destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
+       -ddestdir=* | +ddestdir=* | +ddestdi=* | +ddestd=* | +ddest=* | +ddes=* | +dde=* | +dd=*)
+               ddestdir=`echo ${arg} | sed 's/[+-]dd[a-z]*=//'`
                ;;
-       -languages=* | +languages=* | +language=* | +languag=* \
-               | +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
-               | +l=*)
-               languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
+       -destdir=* | +destdir=* | +destdi=* | +destd=* | +dest=* | +des=* | +de=*)
+               destdir=`echo ${arg} | sed 's/[+-]d[a-z]*=//'`
+               ddestdir=${destdir}
+               idestdir=${destdir}
                ;;
        -gas | +g*)
                gas=yes
@@ -92,6 +94,14 @@ do
        -help | +h*)
                fatal=true
                ;;
+       -idestdir=* | +idestdir=* | +idestdi=* | +idestd=* | +idest=* | +ides=* | +ide=* | +id=*)
+               idestdir=`echo ${arg} | sed 's/[+-]id[a-z]*=//'`
+               ;;
+       -languages=* | +languages=* | +language=* | +languag=* \
+               | +langua=* | +langu=* | +lang=* | +lan=* | +la=* \
+               | +l=*)
+               languages="${languages} `echo ${arg} | sed 's/[+-]l[a-z]*=//'`"
+               ;;
        -nfp | +nf*)
                nfp=yes
                ;;
@@ -201,7 +211,12 @@ if [ -n "${fatal}" -o "${hosts}" = "help" ] ; then
        echo ;
        echo "Options: [defaults in brackets]" ;
        echo " +ansi            configure w/ANSI library. [no ansi lib]" ;
-       echo " +destdir=MYDIR   configure for installation into MYDIR. [\"/usr/local\"]" ;
+       echo " +ddestdir=MYDIR  configure for installation host dependent files" ;
+       echo "                  into MYDIR. [\"/usr/local\"]" ;
+       echo " +idestdir=MYDIR  configure for installation host independent files" ;
+       echo "                  into MYDIR. [\"/usr/local\"]" ;
+       echo " +destdir=MYDIR   configure for installation of both host dependent and" ;
+       echo "                  host independent files into MYDIR. [\"/usr/local\"]" ;
        echo " +gas             configure the compilers for use with gas. [native as]" ;
        echo " +help            print this message. [normal config]" ;
        echo " +lang=LANG       configure to build LANG. [gcc]" ;
@@ -480,6 +495,20 @@ for host in ${hosts} ; do
                        # add "Makefile.in" (or whatever it's called)
                        cat ${srcdir}/${Makefile_in} >> ${Makefile}
 
+                       # Conditionalize the makefile for this site.
+                       if [ -n "${site}" ] ; then
+                               site_makefile_frag=config/ms-${site}
+
+                               if [ -f ${srcdir}/${site_makefile_frag} ] ; then
+                                       (echo "site_makefile_frag = ${srcdir}/${site_makefile_frag}" ; 
+                                               sed -e "/^####/  r ${srcdir}/${site_makefile_frag}" ${Makefile}) > Makefile.tem
+                               else
+                                       (echo "site_makefile_frag =" ; 
+                                               cat ${Makefile}) > Makefile.tem
+                               fi
+                               mv Makefile.tem ${Makefile}
+                       fi
+
                        # Conditionalize the makefile for this host.
                        if [ -f ${srcdir}/${host_makefile_frag} ] ; then
                                (echo "host_makefile_frag = ${srcdir}/${host_makefile_frag}" ;
@@ -500,27 +529,19 @@ for host in ${hosts} ; do
                        fi
                        mv Makefile.tem ${Makefile}
 
-                       # Conditionalize the makefile for this site.
-                       if [ -n "${site}" ] ; then
-                               site_makefile_frag=config/ms-${site}
-
-                               if [ -f ${srcdir}/${site_makefile_frag} ] ; then
-                                       (echo "site_makefile_frag = ${srcdir}/${site_makefile_frag}" ; 
-                                               sed -e "/^####/  r ${srcdir}/${site_makefile_frag}" ${Makefile}) > Makefile.tem
-                               else
-                                       (echo "site_makefile_frag =" ; 
-                                               cat ${Makefile}) > Makefile.tem
-                               fi
-                               mv Makefile.tem ${Makefile}
-                       fi
-
                        # set srcdir
                        sed "s@^srcdir = \.@srcdir = ${srcdir}@" ${Makefile} > Makefile.tem
                        mv Makefile.tem ${Makefile}
 
-                       # set destdir
-                       if [ -n "${destdir}" ] ; then
-                               sed "s:^destdir =.*$:destdir = ${destdir}:" ${Makefile} > Makefile.tem
+                       # set ddestdir
+                       if [ -n "${ddestdir}" ] ; then
+                               sed "s:^ddestdir =.*$:ddestdir = ${ddestdir}:" ${Makefile} > Makefile.tem
+                               mv Makefile.tem ${Makefile}
+                       fi
+
+                       # set idestdir
+                       if [ -n "${idestdir}" ] ; then
+                               sed "s:^idestdir =.*$:idestdir = ${idestdir}:" ${Makefile} > Makefile.tem
                                mv Makefile.tem ${Makefile}
                        fi
 
@@ -646,7 +667,13 @@ exit 0
 #
 #
 # $Log$
-# Revision 1.63  1991/10/25 02:07:18  steve
+# Revision 1.65  1991/11/01 00:25:28  rich
+# new install theme
+#
+# Revision 1.64  1991/10/30  06:55:25  rich
+# suck in site makefile frags first
+#
+# Revision 1.63  1991/10/25  02:07:18  steve
 # More name changing
 #
 # Revision 1.62  1991/10/24  11:59:03  rich