#99053# restructure (new targets, new dependencies)

2 files changed, 40 insertions, 27 deletions

diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk
index aa9a0fcdbc05..c4ff7658fd0a 100644
--- a/odk/util/makefile.mk
+++ b/odk/util/makefile.mk
@@ -7,31 +7,34 @@ TARGET=odk
 .INCLUDE: makefile.pmk
 # ------------------------------------------------------------------
 
-all: zipit 
-
 .IF "$(BUILD_SOSL)"==""
-# for SUN build without minor
-
-zipit .SETDIR=$(DESTDIR)$/.. .PHONY:
-    .IF "$(OS)"=="WNT"
-        +zip -ur $(ODKNAME).zip $(ODKNAME)
-    .ELIF "$(GUI)"=="UNX"
-# 		tar does not properly support update
-        +tar cf - $(ODKNAME) | gzip - > $(ODKNAME).tar.gz
-    .ENDIF
+# for SUN build
+ZIPFILE=$(ODKZIPFILE)
+TARGZFILE=$(ODKTARGZFILE)
+ZIPDIR=$(ODKNAME)
+.ELSE
+# for OO build
+ZIPFILE=$(PRODUCTZIPFILE)
+TARGZFILE=$(PRODUCTTARGZFILE)
+ZIPDIR=$(PRODUCT_NAME)
+.ENDIF
 
+.IF "$(OS)"=="WNT"
+all:\
+    $(BIN)$/$(ZIPFILE)
 .ELSE
-# for OpenOffice build with minor 
+all:\
+    $(BIN)$/$(TARGZFILE)
+.ENDIF
 
-zipit .SETDIR=$(DESTDIR)$/.. .PHONY:
-    .IF "$(OS)"=="WNT"
-        +zip -ur $(PRODUCT_NAME).zip $(PRODUCT_NAME)
-    .ELIF "$(GUI)"=="UNX"
-# 		tar does not properly support update
-        +tar cf - $(PRODUCT_NAME) | gzip - > $(PRODUCT_NAME).tar.gz
-    .ENDIF
 
-.ENDIF
+$(BIN)$/$(ZIPFILE) .SETDIR=$(DESTDIR)$/.. .PHONY:
+    +zip -ur $(ZIPFILE) $(ZIPDIR)
+
+$(BIN)$/$(TARGZFILE) .SETDIR=$(DESTDIR)$/.. .PHONY:
+#	tar does not properly support update
+    +tar cf - $(ZIPDIR) | gzip - > $(TARGZFILE)
+    
 
 
 
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 6514b5dda1d0..21d57161190e 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -4,18 +4,25 @@ ODK_RELEASE=1.0
 
 PRODUCT_NAME=OpenOffice.org$(ODK_RELEASE)
 
-.IF "$(BUILD_SOSL)"==""
-# for SUN build without minor
+PRODUCTZIPFILE=$(PRODUCT_NAME).zip
+PRODUCTTARGZFILE=$(PRODUCT_NAME).tar.gz
+
+
 ODKNAME=odk$(UPD)
 ODKDOCNAME=$(ODKNAME)_doc
-.ELSE
-# for OpenOffice build with minor 
-ODKNAME=odk$(UPD)$(LAST_MINOR)
-ODKDOCNAME=$(ODKNAME)_doc
-.ENDIF
 
+ODKZIPFILE=$(ODKNAME).zip
+ODKTARGZFILE=$(ODKNAME).tar.gz
 
+
+.IF "$(BUILD_SOSL)"==""
+# for Sun build use ODKNAME as directory name
 DESTDIR=$(OUT)$/bin$/$(ODKNAME)
+.ELSE
+# for OpenOffice build use PRODUCT_NAME as directory name
+DESTDIR=$(OUT)$/bin$/$(PRODUCT_NAME)
+.ENDIF
+
 DESTDIRIDL=$(DESTDIR)$/idl
 DESTDIRSETTINGS=$(DESTDIR)$/settings
 DESTDIREXAMPLES=$(DESTDIR)$/examples
@@ -30,6 +37,7 @@ DESTDIRDOCUIMAGES=$(DESTDIRDOCU)$/images
 
 UDKZIPPATH=$(SOLARBINDIR)
 UDKNAME=udk$(UDK_MAJOR).$(UDK_MINOR).$(UDK_MICRO)
+UDKZIPPREFIX=$(UDKNAME)_odk
 CHECKSCRIPT=$(SOLARENV)$/bin$/checkit.pl
  
 BINOUT=$(SOLARBINDIR)
@@ -45,6 +53,7 @@ CONVERTSCRIPT=$(SOLARENV)$/bin$/convertlinks.pl
 #--------------------
 # WNT ONLY
 #--------------------
+DOLLARSIGN=$$
 MY_DELETE_RECURSIVE=del /sxyf
 MY_DIRCMP=dircmp -r
 MY_TEXTCOPY=cat
@@ -62,6 +71,7 @@ DESTDIRDLL=$(DESTDIRBIN)
 #--------------------
 # UNX ONLY
 #--------------------
+DOLLARSIGN=\$$
 MY_DELETE_RECURSIVE=rm -rf
 MY_DIRCMP=dircmp 
 MY_TEXTCOPY= tr -d "\015"