From ###@###.### Mon Feb 5 08:35:20 1996
Date: Mon, 5 Feb 1996 17:34:00 +0100 (MET)
From: Simon Leinen <###@###.###>
To: java@java
Subject: JDK 1.0 source: makefile patches for file manipulation

Here are several patches that make the JDK makefiles more portable and
easier to use. There are two types of changes:

1.) where directories are created using "mkdir", I have added tests
    to check whether the directories exist already. This makes it
    possible to re-run make when directories have already been made.

2.) in java/java/GNUmakefile, ln -s is called with only one other
    argument. This is not portable to other Unices such as IRIX, so I
    have added "." as an additional argument.

Finally, I have removed a lonely tab in a makefile that might confuse
some makes.

--- build/solaris/sun/javac/GNUmakefile Thu Jan 18 19:41:22 1996
+++ build/solaris/sun/javac/GNUmakefile Sun Feb 4 12:45:54 1996
@@ -76,21 +76,21 @@
                RuntimeConstants.java $(SRCDIR)/sun/tools/javac/Main.java \\
                $(JAVACLASSFILES)
        -$(RM) -f $(TOPDIR)/build/lib/javac.properties
- mkdir -p $(TOPDIR)/build/lib
+ test -d $(TOPDIR)/build/lib || mkdir -p $(TOPDIR)/build/lib
        cp $(PROPS) $(TOPDIR)/build/lib
        -$(RM) -rf $(CLASSBINDIR)/java ; mv boot/java $(CLASSBINDIR)
        cp javac.sh $(JAVAC) ; cp javac_g.sh $(JAVAC)_g ; \\
                chmod +x $(JAVAC) $(JAVAC)_g
        -$(RM) -f $(BINDIR)/javac ; ln -s .java_wrapper $(BINDIR)/javac
        -$(RM) -f $(BINDIR)/javac_g ; ln -s .java_wrapper $(BINDIR)/javac_g
-
+
 bootstrap:
        -$(RM) -rf boot ; mkdir -p boot/java
        $(JAVAC_CMD) -O -verbose -d boot -classpath $(SRCDIR):$(JAVASRCDIR)
                RuntimeConstants.java $(SRCDIR)/sun/tools/javac/Main.java \\
                $(JAVACLASSFILES)
        -$(RM) -f $(TOPDIR)/build/lib/javac.properties
- mkdir -p $(TOPDIR)/build/lib
+ test -d $(TOPDIR)/build/lib || mkdir -p $(TOPDIR)/build/lib
        cp $(PROPS) $(TOPDIR)/build/lib
        -$(RM) -rf $(CLASSBINDIR)/java ; mv boot/java $(CLASSBINDIR)
 
@@ -107,7 +107,7 @@
 
 $(TOPDIR)/build/lib/javac.properties : $(PROPS)
        -$(RM) $(TOPDIR)/build/lib/javac.properties
- mkdir -p $(@D)
+ test -d $(@D) || mkdir -p $(@D)
        cp $(PROPS) $(TOPDIR)/build/lib/javac.properties
 
 $(CLASSBINDIR)/sun/tools/java/RuntimeConstants.class: RuntimeConstants.java
--- build/solaris/java/java/GNUmakefile Thu Jan 18 19:41:22 1996
+++ build/solaris/java/java/GNUmakefile Sun Feb 4 12:45:54 1996
@@ -174,15 +182,15 @@
 # CClassHeaders/java_lang_ClassLoader.h)
 
 .install.includes: $(INSTALLINCLUDES)
- mkdir -p $(TOPDIR)/build/include
+ test -d $(TOPDIR)/build/include || mkdir -p $(TOPDIR)/build/include
        (cd $(TOPDIR)/build/include ; rm -f *.h ; \\
                ln -s ../../src/share/java/include/*.h .)
        (cd $(TOPDIR)/build/include ; rm -f $(PLATFORM) ; \\
                ln -s ../../src/$(PLATFORM)/java/include $(PLATFORM))
        (cd $(TOPDIR)/build/include ; rm -f java_lang_String.h ; \\
- ln -s ../$(PLATFORM)/java/java/CClassHeaders/java_lang_String.h)
+ ln -s ../$(PLATFORM)/java/java/CClassHeaders/java_lang_String.h .)
        (cd $(TOPDIR)/build/include ; rm -f java_lang_ClassLoader.h ; \\
- ln -s ../$(PLATFORM)/java/java/CClassHeaders/java_lang_ClassLoader.h)
+ ln -s ../$(PLATFORM)/java/java/CClassHeaders/java_lang_ClassLoader.h .)
        @-touch .install.includes
 
 # Rule for building BreakpointHandler.class
--- build/solaris/makefiles/Library.gmk Thu Jan 18 19:41:08 1996
+++ build/solaris/makefiles/Library.gmk Sun Feb 4 12:45:54 1996
@@ -56,7 +56,8 @@
        @-touch .library.headers
 
 .library.dirs.$(ARCH):
- @mkdir -p $(LIBDIR)/$(ARCH) $(OBJDIRS)
+ @for dir in $(LIBDIR)/$(ARCH) $(OBJDIRS); \\
+ do test -d $$dir || mkdir -p $$dir; done
        @-touch .library.dirs.$(ARCH)
 
 library.clean:
--- build/solaris/makefiles/Program.gmk Thu Jan 18 19:41:09 1996
+++ build/solaris/makefiles/Program.gmk Sun Feb 4 12:45:54 1996
@@ -43,7 +43,8 @@
        chmod +x $(BINDIR)/.java_wrapper
 
 .program.dirs.$(ARCH):
- @mkdir -p $(OBJDIRS) $(BINDIR)/$(ARCH) $(CLASSBINDIR)
+ @for dir in $(OBJDIRS) $(BINDIR)/$(ARCH) $(CLASSBINDIR); \\
+ do test -d $$dir || mkdir -p $$dir; done
        @-touch .program.dirs.$(ARCH)
 
 $(PROGRAM_HEADERS): $(FILES.export:%.java=$(CLASSBINDIR)/%.class)
--- build/solaris/sun/applet/GNUmakefile Thu Jan 18 19:41:16 1996
+++ build/solaris/sun/applet/GNUmakefile Sun Feb 4 12:45:54 1996
@@ -42,5 +42,5 @@
        rm -rf .bin.* $(BINDIR)/appletviewer $(BINDIR)/upgrade
 
 .bin.dirs:
- mkdir -p $(BINDIR)
+ test -d $(BINDIR) || mkdir -p $(BINDIR)
        touch .bin.dirs
--
Simon.