4.4 support.

SCCS-vsn: local/X11R5/mit/Makefile.ini 1.2
SCCS-vsn: local/X11R5/mit/config/Makefile.ini 1.2
SCCS-vsn: local/X11R5/mit/config/hpbsd.cf 1.2
SCCS-vsn: local/X11R5/mit/config/imakemdep.h 1.2

diff --git a/usr/src/local/X11R5/mit/Makefile.ini b/usr/src/local/X11R5/mit/Makefile.ini
index a9da34c..1fa84c5 100644 (file)
--- a/usr/src/local/X11R5/mit/Makefile.ini
+++ b/usr/src/local/X11R5/mit/Makefile.ini
@@ -9,6 +9,7 @@
     IRULESRC = $(CONFIGSRC)
        IMAKE = $(IMAKESRC)/imake
    IMAKE_CMD = $(NEWTOP)$(IMAKE) -I$(NEWTOP)$(IRULESRC) $(IMAKE_DEFINES)
     IRULESRC = $(CONFIGSRC)
        IMAKE = $(IMAKESRC)/imake
    IMAKE_CMD = $(NEWTOP)$(IMAKE) -I$(NEWTOP)$(IRULESRC) $(IMAKE_DEFINES)

+#   IMAKE_CMD = /usr/X11/bin/imake -I$(NEWTOP)$(IRULESRC) $(IMAKE_DEFINES)

        FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"
 
 all:
        FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)"
 
 all:


@@ -31,6 +32,7 @@ World:
        @date
        @echo ""
        cd $(IMAKESRC); $(MAKE) $(FLAGS) clean; $(MAKE) $(FLAGS)
        @date
        @echo ""
        cd $(IMAKESRC); $(MAKE) $(FLAGS) clean; $(MAKE) $(FLAGS)

+       cd $(IMAKESRC); rm imake; ln -s /usr/X11/bin/imake imake

        -$(RM) Makefile.bak; $(MV) Makefile Makefile.bak
        $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
        $(MAKE) $(MFLAGS) Makefiles
        -$(RM) Makefile.bak; $(MV) Makefile Makefile.bak
        $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
        $(MAKE) $(MFLAGS) Makefiles

diff --git a/usr/src/local/X11R5/mit/config/Makefile.ini b/usr/src/local/X11R5/mit/config/Makefile.ini
index daac036..9385ffc 100644 (file)
--- a/usr/src/local/X11R5/mit/config/Makefile.ini
+++ b/usr/src/local/X11R5/mit/config/Makefile.ini
@@ -22,7 +22,9 @@ imake::
        @echo "making imake with BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS)"
 
 imake:: imake.o
        @echo "making imake with BOOTSTRAPCFLAGS=$(BOOTSTRAPCFLAGS)"
 
 imake:: imake.o

-       $(CC) -o imake imake.o
+       rm -f imake
+       ln -s /usr/X11/bin/imake imake
+#      $(CC) -o imake imake.o

 
 imake.o: ccimake imake.c
        $(CC) -c $(CFLAGS) `./ccimake` imake.c
 
 imake.o: ccimake imake.c
        $(CC) -c $(CFLAGS) `./ccimake` imake.c

diff --git a/usr/src/local/X11R5/mit/config/hpbsd.cf b/usr/src/local/X11R5/mit/config/hpbsd.cf
index f8ffb73..97054e3 100644 (file)
--- a/usr/src/local/X11R5/mit/config/hpbsd.cf
+++ b/usr/src/local/X11R5/mit/config/hpbsd.cf
@@ -37,8 +37,8 @@ XCOMM operating system:  OSName
 #define CcCmd gcc -fstrength-reduce
 #else
 #define HasVoidSignalReturn YES
 #define CcCmd gcc -fstrength-reduce
 #else
 #define HasVoidSignalReturn YES

-#define CcCmd gcc2
-#define CppCmd /usr/libexec/cpp
+#define CcCmd gcc
+#define CppCmd /usr/libexec/gcc2/cpp

 #define StandardCppDefines -traditional StandardDefines
 #define HasDB YES  /* for Berkeley DB routines */
 #define HasBsearch YES
 #define StandardCppDefines -traditional StandardDefines
 #define HasDB YES  /* for Berkeley DB routines */
 #define HasBsearch YES

diff --git a/usr/src/local/X11R5/mit/config/imakemdep.h b/usr/src/local/X11R5/mit/config/imakemdep.h
index 4b708ff..ceca378 100644 (file)
--- a/usr/src/local/X11R5/mit/config/imakemdep.h
+++ b/usr/src/local/X11R5/mit/config/imakemdep.h
@@ -127,7 +127,7 @@
 #define DEFAULT_CPP "/usr/lpp/X11/Xamples/util/cpp/cpp"
 #endif
 #if defined(hp9000) && !defined(DEFAULT_CPP)
 #define DEFAULT_CPP "/usr/lpp/X11/Xamples/util/cpp/cpp"
 #endif
 #if defined(hp9000) && !defined(DEFAULT_CPP)

-#define DEFAULT_CPP "/usr/libexec/cpp"
+#define DEFAULT_CPP "/usr/libexec/gcc2/cpp"

 #endif
 
 /*
 #endif
 
 /*