Attachment #4811 for issue #11604

View | Details | Raw Unified | Return to issue 11604
Collapse All | Expand All




	$(DESTDIRXML)       \
	$(DESTDIRINC)       \
	$(DESTDIRSETTINGS)  \
	$(DESTDIREXAMPLES)  \
	$(DESTDIREXAMPLESCPP)   \
	$(DESTDIREXAMPLESCPP)$/remoteclient \
	$(DESTDIREXAMPLESCPP)$/counter      \

# TARGETS
#--------------------------------------------------
ALLTARGETS = \
	$(MISC)$/deltree.txt 	\
	$(DIRLIST) 		\
	$(FILELIST)

.IF "$(GUI)"=="WNT"
ALLTARGETS+= \
    $(BIN)$/$(ODK_PARTZIPFILE) \
.ELSE
ALLTARGETS+= \
    $(BIN)$/$(ODK_PARTTARGZFILE)
.ENDIF
    
.IF "$(BUILD_SOSL)"!=""
#for OpenOffice build additionally a complete UDK
ALLTARGETS+= \
	$(ADDITIONALFILELIST)
.ENDIF

.IF "$(GUI)"=="WNT"
ALLTARGETS+= \
    $(BIN)$/$(PRODUCTZIPFILE)
.ELSE
ALLTARGETS+= \
    $(BIN)$/$(ODK_PARTTARGZFILE) \
    $(BIN)$/$(PRODUCTTARGZFILE)
.ENDIF

    
all: \
    $(ALLTARGETS) 

.IF "$(STLPORTDEST)" != ""
#OOo build environment
$(STLPORTDEST) : $(STLPORTOUT)
	$(GNUCOPY) -p $(STLPORTOUT) $@
.ENDIF

$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX)
	$(MKDIRHIER) $(DESTDIRBIN)
	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@

$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX)
	$(MKDIRHIER) $(DESTDIRDLL)
	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@

$(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX)
	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@

$(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX)
	-rm -f $@
	-rm -f $(@:db)
	+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@

       $(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)

# Otherwise you get circular dependencies
$(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) : $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3)
       -rm -f $@
       $(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $@

$(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) : $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3)
       -rm -f $@
       +ln -s libstdc++.so.$(LIBSTDCPP3) $@
.ENDIF

$(DLLOUT)$/libgcc_s.so.1 :
       $(GCCINSTLIB) libgcc_s.so.1 $(DLLOUT)

$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1
	-rm -f $@
	$(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@

$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1
	-rm -f $@
	+ln -s libgcc_s.so.1 $@
#-------------------------------------------------------------

$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar
	$(MKDIRHIER) $(@:d)
	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@

$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml
	$(MKDIRHIER) $(@:d)
	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/$(@:f) $(MY_TEXTCOPY_TARGETPRE) $@

$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd
	$(MKDIRHIER) $(@:d)
	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@

$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib
	$(MKDIRHIER) $(@:d)
	$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@

$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk
	$(MKDIRHIER) $(@:d)
	+-rm -f $@ >& $(NULLDEV)
	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/settings$/$(@:f) $(MY_TEXTCOPY_TARGETPRE) $@

# EXAMPLES CPP RULE
$(DESTDIREXAMPLESCPP)$/% : $(PRJ)$/examples$/cpp$/%
	$(MKDIRHIER) $(@:d)
	+-rm -f $@ >& $(NULLDEV)
	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) \
	  $(subst,$(DESTDIREXAMPLESCPP),$(PRJ)$/examples$/cpp $@) $(MY_TEXTCOPY_TARGETPRE) $@

$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README
	$(MKDIRHIER) $(@:d)
	$(GNUCOPY) -p $(PRJ)$/examples$/README $@

$(DESTDIRIDL)$/% : $(IDLOUT)$/%
	$(MKDIRHIER) $(@:d)
	+-rm -f $@
	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) \
	  $(subst,$(DESTDIRIDL),$(IDLOUT) $@) $(MY_TEXTCOPY_TARGETPRE) $@

$(DESTDIRINC)$/% : $(INCOUT)$/%
	$(MKDIRHIER) $(@:d)
	+-rm -f $@
	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(subst,$(DESTDIRINC),$(INCOUT) $@) $(MY_TEXTCOPY_TARGETPRE) $@

# ------------------------------------------------------------------------------------
#      ZIP IT
# ------------------------------------------------------------------------------------
$(BIN)$/$(ODK_PARTZIPFILE) : $(FILELIST)
	+-$(RM) -f $(ADDITIONALFILELIST) >& $(NULLDEV)
	+-$(RM) $@
	+cd $(DESTDIR)$/.. && zip -9 -r $(ODK_PARTZIPFILE) $(PRODUCT_NAME)

$(BIN)$/$(ODK_PARTTARGZFILE) : $(FILELIST)
	+-$(MY_DELETE_RECURSIVE) $(ADDITIONALFILELIST) >& $(NULLDEV)
	+-$(RM) $@
	+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) | gzip -c > $(ODK_PARTTARGZFILE)

$(BIN)$/$(PRODUCTZIPFILE) .SEQUENTIAL : $(BIN)$/$(ODK_PARTZIPFILE) $(ADDITIONALFILELIST)
	+-$(RM) $@
	+cd $(DESTDIR)$/.. && zip -9 -r $(PRODUCTZIPFILE) $(PRODUCT_NAME)

$(BIN)$/$(PRODUCTTARGZFILE) .SEQUENTIAL : $(BIN)$/$(ODK_PARTTARGZFILE) $(ADDITIONALFILELIST)
	+-$(RM) $@
	+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) | gzip -c > $(PRODUCTTARGZFILE)


Return to issue 11604

Lines 298-303 DIRLIST = \ Link Here

(-)makefile.mk (-42 / +41 lines)
298	$(DESTDIRXML) \	298	$(DESTDIRXML) \
299	$(DESTDIRINC) \	299	$(DESTDIRINC) \
300	$(DESTDIRSETTINGS) \	300	$(DESTDIRSETTINGS) \
		301	$(DESTDIREXAMPLES) \
301	$(DESTDIREXAMPLESCPP) \	302	$(DESTDIREXAMPLESCPP) \
302	$(DESTDIREXAMPLESCPP)$/remoteclient \	303	$(DESTDIREXAMPLESCPP)$/remoteclient \
303	$(DESTDIREXAMPLESCPP)$/counter \	304	$(DESTDIREXAMPLESCPP)$/counter \
Lines 428-459 ADDITIONALFILELIST= \ Link Here
428	# TARGETS	429	# TARGETS
429	#--------------------------------------------------	430	#--------------------------------------------------
430	ALLTARGETS = \	431	ALLTARGETS = \
431	$(MISC)$/deltree.txt \
432	$(DIRLIST) \
433	$(FILELIST)	432	$(FILELIST)
434		433
435	.IF "$(GUI)"=="WNT"	434	.IF "$(GUI)"=="WNT"
436	ALLTARGETS+= \	435	ALLTARGETS+= \
437	$(BIN)$/$(ODK_PARTZIPFILE)	436	$(BIN)$/$(ODK_PARTZIPFILE) \
438	.ELSE
439	ALLTARGETS+= \
440	$(BIN)$/$(ODK_PARTTARGZFILE)
441	.ENDIF
442
443	.IF "$(BUILD_SOSL)"!=""
444	#for OpenOffice build additionally a complete UDK
445	ALLTARGETS+= \
446	$(ADDITIONALFILELIST)
447	.ENDIF
448
449	.IF "$(GUI)"=="WNT"
450	ALLTARGETS+= \
451	$(BIN)$/$(PRODUCTZIPFILE)	437	$(BIN)$/$(PRODUCTZIPFILE)
452	.ELSE	438	.ELSE
453	ALLTARGETS+= \	439	ALLTARGETS+= \
		440	$(BIN)$/$(ODK_PARTTARGZFILE) \
454	$(BIN)$/$(PRODUCTTARGZFILE)	441	$(BIN)$/$(PRODUCTTARGZFILE)
455	.ENDIF	442	.ENDIF
456
457		443
458	all: \	444	all: \
459	$(ALLTARGETS)	445	$(ALLTARGETS)
Lines 474-492 $(DESTDIRBIN)$/udkapi.rdb : $(BINOUT)$/u Link Here
474	.IF "$(STLPORTDEST)" != ""	460	.IF "$(STLPORTDEST)" != ""
475	#OOo build environment	461	#OOo build environment
476	$(STLPORTDEST) : $(STLPORTOUT)	462	$(STLPORTDEST) : $(STLPORTOUT)
477	$(GNUCOPY) -p $(STLPORTOUT) $@	463	$(GNUCOPY) -p $(STLPORTOUT) $@
478	.ENDIF	464	.ENDIF
479		465
480	$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) $(DIRLIST)	466	$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX)
		467	$(MKDIRHIER) $(DESTDIRBIN)
481	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@	468	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
482		469
483	$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) $(DIRLIST)	470	$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX)
		471	$(MKDIRHIER) $(DESTDIRDLL)
484	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@	472	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
485		473
486	$(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)	474	$(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_VERSION_DLLPOSTFIX)
487	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@	475	$(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@
488		476
489	$(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST)	477	$(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX)
490	-rm -f $@	478	-rm -f $@
491	-rm -f $(@:db)	479	-rm -f $(@:db)
492	+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@	480	+ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@
Lines 502-512 $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) : Link Here
502	$(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)	490	$(GCCINSTLIB) libstdc++.so.$(LIBSTDCPP3) $(DLLOUT)
503		491
504	# Otherwise you get circular dependencies	492	# Otherwise you get circular dependencies
505	$(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) : $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $(DIRLIST)	493	$(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) : $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3)
506	-rm -f $@	494	-rm -f $@
507	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $@	495	$(GNUCOPY) -p $(DLLOUT)$/libstdc++.so.$(LIBSTDCPP3) $@
508		496
509	$(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) : $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3) $(DIRLIST)	497	$(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCPP3) : $(DESTDIRDLL)$/libstdc++.so.$(LIBSTDCPP3)
510	-rm -f $@	498	-rm -f $@
511	+ln -s libstdc++.so.$(LIBSTDCPP3) $@	499	+ln -s libstdc++.so.$(LIBSTDCPP3) $@
512	.ENDIF	500	.ENDIF
Lines 514-578 $(DESTDIRDLL)$/libstdc++.so.$(SHORTSTDCP Link Here
514	$(DLLOUT)$/libgcc_s.so.1 :	502	$(DLLOUT)$/libgcc_s.so.1 :
515	$(GCCINSTLIB) libgcc_s.so.1 $(DLLOUT)	503	$(GCCINSTLIB) libgcc_s.so.1 $(DLLOUT)
516		504
517	$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST)	505	$(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1
518	-rm -f $@	506	-rm -f $@
519	$(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@	507	$(GNUCOPY) -p $(DLLOUT)$/libgcc_s.so.1 $@
520		508
521	$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST)	509	$(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1
522	-rm -f $@	510	-rm -f $@
523	+ln -s libgcc_s.so.1 $@	511	+ln -s libgcc_s.so.1 $@
524	#-------------------------------------------------------------	512	#-------------------------------------------------------------
525		513
526	$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar $(DIRLIST)	514	$(DESTDIRJAR)$/%.jar : $(BINOUT)$/%.jar
		515	$(MKDIRHIER) $(@:d)
527	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@	516	$(GNUCOPY) -p $(BINOUT)$/$(@:f) $@
528		517
529	$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml $(DIRLIST)	518	$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml
530	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@	519	$(MKDIRHIER) $(@:d)
		520	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/$(@:f) $(MY_TEXTCOPY_TARGETPRE) $@
531		521
532	$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd $(DIRLIST)	522	$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd
		523	$(MKDIRHIER) $(@:d)
533	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@	524	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@
534		525
535	$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib $(DIRLIST)	526	$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib
		527	$(MKDIRHIER) $(@:d)
536	$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@	528	$(GNUCOPY) -p $(LIBOUT)$/$(@:f) $@
537		529
538	$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk $(DIRLIST)	530	$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk
		531	$(MKDIRHIER) $(@:d)
539	+-rm -f $@ >& $(NULLDEV)	532	+-rm -f $@ >& $(NULLDEV)
540	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@	533	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/settings$/$(@:f) $(MY_TEXTCOPY_TARGETPRE) $@
541		534
542	# EXAMPLES CPP RULE	535	# EXAMPLES CPP RULE
543	$(DESTDIREXAMPLESCPP)$/% : $(PRJ)$/examples$/cpp$/%	536	$(DESTDIREXAMPLESCPP)$/% : $(PRJ)$/examples$/cpp$/%
		537	$(MKDIRHIER) $(@:d)
544	+-rm -f $@ >& $(NULLDEV)	538	+-rm -f $@ >& $(NULLDEV)
545	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@	539	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) \
		540	$(subst,$(DESTDIREXAMPLESCPP),$(PRJ)$/examples$/cpp $@) $(MY_TEXTCOPY_TARGETPRE) $@
546		541
547	$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README	542	$(DESTDIREXAMPLES)$/README : $(PRJ)$/examples$/README
		543	$(MKDIRHIER) $(@:d)
548	$(GNUCOPY) -p $(PRJ)$/examples$/README $@	544	$(GNUCOPY) -p $(PRJ)$/examples$/README $@
549		545
550	$(DESTDIRIDL)$/% : $(IDLOUT)$/%	546	$(DESTDIRIDL)$/% : $(IDLOUT)$/%
		547	$(MKDIRHIER) $(@:d)
551	+-rm -f $@	548	+-rm -f $@
552	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@	549	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) \
		550	$(subst,$(DESTDIRIDL),$(IDLOUT) $@) $(MY_TEXTCOPY_TARGETPRE) $@
553		551
554	$(DESTDIRINC)$/% : $(INCOUT)$/%	552	$(DESTDIRINC)$/% : $(INCOUT)$/%
		553	$(MKDIRHIER) $(@:d)
555	+-rm -f $@	554	+-rm -f $@
556	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $? $(MY_TEXTCOPY_TARGETPRE) $@	555	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(subst,$(DESTDIRINC),$(INCOUT) $@) $(MY_TEXTCOPY_TARGETPRE) $@
557		556
558	# ------------------------------------------------------------------------------------	557	# ------------------------------------------------------------------------------------
559	# ZIP IT	558	# ZIP IT
560	# ------------------------------------------------------------------------------------	559	# ------------------------------------------------------------------------------------
561	$(BIN)$/$(ODK_PARTZIPFILE) : $(DIRLIST) $(FILELIST)	560	$(BIN)$/$(ODK_PARTZIPFILE) : $(FILELIST)
562	+-$(RM) -f $(ADDITIONALFILELIST) >& $(NULLDEV)	561	+-$(RM) -f $(ADDITIONALFILELIST) >& $(NULLDEV)
563	+-$(RM) $@	562	+-$(RM) $@
564	+cd $(DESTDIR)$/.. && zip -9 -r $(ODK_PARTZIPFILE) $(PRODUCT_NAME)	563	+cd $(DESTDIR)$/.. && zip -9 -r $(ODK_PARTZIPFILE) $(PRODUCT_NAME)
565		564
566	$(BIN)$/$(ODK_PARTTARGZFILE) : $(DIRLIST) $(FILELIST)	565	$(BIN)$/$(ODK_PARTTARGZFILE) : $(FILELIST)
567	+-$(MY_DELETE_RECURSIVE) $(ADDITIONALFILELIST) >& $(NULLDEV)	566	+-$(MY_DELETE_RECURSIVE) $(ADDITIONALFILELIST) >& $(NULLDEV)
568	+-$(RM) $@	567	+-$(RM) $@
569	+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) \| gzip -c > $(ODK_PARTTARGZFILE)	568	+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) \| gzip -c > $(ODK_PARTTARGZFILE)
570		569
571	$(BIN)$/$(PRODUCTZIPFILE) : $(BIN)$/$(ODK_PARTZIPFILE) $(ADDITIONALFILELIST)	570	$(BIN)$/$(PRODUCTZIPFILE) .SEQUENTIAL : $(BIN)$/$(ODK_PARTZIPFILE) $(ADDITIONALFILELIST)
572	+-$(RM) $@	571	+-$(RM) $@
573	+cd $(DESTDIR)$/.. && zip -9 -r $(PRODUCTZIPFILE) $(PRODUCT_NAME)	572	+cd $(DESTDIR)$/.. && zip -9 -r $(PRODUCTZIPFILE) $(PRODUCT_NAME)
574		573
575	$(BIN)$/$(PRODUCTTARGZFILE) : $(BIN)$/$(ODK_PARTTARGZFILE) $(ADDITIONALFILELIST)	574	$(BIN)$/$(PRODUCTTARGZFILE) .SEQUENTIAL : $(BIN)$/$(ODK_PARTTARGZFILE) $(ADDITIONALFILELIST)
576	+-$(RM) $@	575	+-$(RM) $@
577	+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) \| gzip -c > $(PRODUCTTARGZFILE)	576	+cd $(DESTDIR)$/.. && tar cvf - $(PRODUCT_NAME) \| gzip -c > $(PRODUCTTARGZFILE)
578		577