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

(-)odk/pack/copying/makefile.mk (-1 / +1 lines)
Lines 781-787 Link Here
781 
	+-rm -f $@ >& $(NULLDEV)
 781 
	+-rm -f $@ >& $(NULLDEV)
782 
    echo #$(PRODUCT_NAME) dependent settings > $@
 782 
    echo #$(PRODUCT_NAME) dependent settings > $@
783 
    echo DKNAME=${PRODUCT_NAME} >> $@
783 
    echo DKNAME=${PRODUCT_NAME} >> $@
784 
.IF "$(GUI)"=="UNX"
 784 
.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
785 
	echo 'DKREGISTRYNAME=$$(subst \\,\,"$$(OFFICE_PROGRAM_PATH)$$(PS)applicat.rdb")' >> $@
 785 
	echo 'DKREGISTRYNAME=$$(subst \\,\,"$$(OFFICE_PROGRAM_PATH)$$(PS)applicat.rdb")' >> $@
786 
.ELSE
 786 
.ELSE
787 
	echo DKREGISTRYNAME=$$(subst \\,\,"$$(OFFICE_PROGRAM_PATH)$$(PS)applicat.rdb") >> $@
 787 
	echo DKREGISTRYNAME=$$(subst \\,\,"$$(OFFICE_PROGRAM_PATH)$$(PS)applicat.rdb") >> $@
(-)odk/source/OOSupport/makefile.mk (-1 / +1 lines)
Lines 337-341 Link Here
337 
	+cp -R ParserDB $(CLASSDIR)$/netbeans$/system
 337 
	+cp -R ParserDB $(CLASSDIR)$/netbeans$/system
338 
	+cp openoffice-nbm-license.txt $(CLASSDIR)
 338 
	+cp openoffice-nbm-license.txt $(CLASSDIR)
339 
	+-mkdir $(CLASSDIR)$/netbeans$/modules
 339 
	+-mkdir $(CLASSDIR)$/netbeans$/modules
340 
	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && java MakeModule
 340 
	+cd $(CLASSDIR) && cp oosupport.jar netbeans$/modules && $(WRAPCMD) java -classpath $(CLASSPATH) MakeModule
341 
	+cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans
 341 
	+cd $(CLASSDIR) && jar -uvf $(TARGETNETBEANSMODULEFILE) netbeans

Return to issue 12045