summaryrefslogtreecommitdiff
path: root/odk/util/makefile.mk
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2003-08-27 15:48:34 +0000
committerKurt Zenker <kz@openoffice.org>2003-08-27 15:48:34 +0000
commit28e024d2d61434a8edc72194dbe677014fc14979 (patch)
tree359464ed0f04f60808bc18004dacb2ffe72b433a /odk/util/makefile.mk
parent99a87a4708247ee22f2ab5f852f5f916350cf165 (diff)
INTEGRATION: CWS geordi2q03 (1.17.16); FILE MERGED
2003/08/27 15:06:24 hr 1.17.16.1: #111934#: join from CWS sdk07
Diffstat (limited to 'odk/util/makefile.mk')
-rw-r--r--odk/util/makefile.mk21
1 files changed, 9 insertions, 12 deletions
diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk
index 5e445931f91a..0ba8eeeb96e5 100644
--- a/odk/util/makefile.mk
+++ b/odk/util/makefile.mk
@@ -7,30 +7,27 @@ TARGET=odk
.INCLUDE: makefile.pmk
# ------------------------------------------------------------------
-ZIPFILE=$(PRODUCTZIPFILE)
-TARGZFILE=$(PRODUCTTARGZFILE)
-ZIPDIR=$(PRODUCT_NAME)
-
.IF "$(OS)"=="WNT"
all:\
- $(BIN)$/$(ZIPFILE)
+ $(BIN)$/$(PRODUCTZIPFILE)
.ELSE
all:\
- $(BIN)$/$(TARGZFILE)
+ $(BIN)$/$(PRODUCTTARGZFILE)
.ENDIF
+$(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDKCHECKFLAG)
+ +cd $(BIN) && $(WRAPCMD) zip -urq $(PRODUCTZIPFILE) $(PRODUCT_NAME)
-$(BIN)$/$(ZIPFILE) .SETDIR=$(DESTDIR)$/.. .PHONY:
- +-$(WRAPCMD) zip -urq $(ZIPFILE) $(ZIPDIR)
-
-$(BIN)$/$(TARGZFILE) .SETDIR=$(DESTDIR)$/.. .PHONY:
+$(BIN)$/$(PRODUCTTARGZFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDKCHECKFLAG)
+ +-rm -f $@ >& $(NULLDEV)
# tar does not properly support update
.IF "$(OS)"=="SOLARIS"
# always use the system tar on Solaris
- +/usr/bin/tar cf - $(ZIPDIR) | gzip - > $(TARGZFILE)
+ +cd $(BIN) && /usr/bin/tar cf - $(PRODUCT_NAME) | gzip - > $(PRODUCTTARGZFILE)
.ELSE
- +tar cf - $(ZIPDIR) | gzip - > $(TARGZFILE)
+ +cd $(BIN) && tar cf - $(PRODUCT_NAME) | gzip - > $(PRODUCTTARGZFILE)
.ENDIF
+