File ooo-build-3.0.99.4-piece-sdk-with-ure.diff of Package OpenOffice_org-ure

Overview Repositories Revisions Requests Users Attributes Meta

File ooo-build-3.0.99.4-piece-sdk-with-ure.diff of Package OpenOffice_org-ure

--- odk/util/makefile.pmk.old	2009-04-16 15:28:52.000000000 +0200
+++ odk/util/makefile.pmk	2009-04-16 16:30:10.000000000 +0200
@@ -62,11 +62,11 @@ DESTDIRGENCPPREF=$(DESTDIRDOCU)$/cpp$/re
 DESTDIRJAVADOCU=$(DESTDIRDOCU)$/java
 DESTDIRGENJAVAREF=$(DESTDIRDOCU)$/java$/ref
 
-BINOUT=$(SOLARBINDIR)
-INCOUT=$(SOLARINCDIR)
-IDLOUT=$(SOLARIDLDIR)
-XMLOUT=$(SOLARXMLDIR)
-LIBOUT=$(SOLARLIBDIR)
+BINOUT=$(SOLARPIECE)$/$(INPATH)$/bin
+INCOUT=$(SOLARPIECE)$/$(INPATH)$/inc
+IDLOUT=$(SOLARPIECE)$/$(INPATH)$/idl
+XMLOUT=$(SOLARPIECE)$/$(INPATH)$/xml
+LIBOUT=$(SOLARPIECE)$/$(INPATH)$/lib
 
 CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/converttags.pl
 CONVERTTAGFLAGNAME=converttags_html_files.flag
@@ -197,7 +197,7 @@ INCLUDETOPDIRLIST= \
 	$(INCOUT)$/cppuhelper \
 	$(INCOUT)$/bridges \
 	$(INCOUT)$/registry \
-	$(INCOUT)$/stl
+	$(SOLARINCDIR)$/stl
 
 .IF "$(GUI)"=="WNT"
 INCLUDETOPDIRLIST += $(INCOUT)$/systools
--- unodevtools/source/skeletonmaker/makefile.mk.old	2009-04-16 15:28:40.000000000 +0200
+++ unodevtools/source/skeletonmaker/makefile.mk	2009-04-16 15:39:07.000000000 +0200
@@ -51,8 +51,8 @@ APP1OBJS = $(OBJ)$/skeletonmaker.obj \
 	$(OBJ)$/javacompskeleton.obj \
 	$(OBJ)$/cppcompskeleton.obj
 
-APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \
-	$(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
+APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN) $(SOLARPIECE)$/$(INPATH)$/lib$/$(CODEMAKERLIBDEPN) \
+	$(SOLARPIECE)$/$(INPATH)$/lib$/$(COMMONCPPLIBDEPN) $(SOLARPIECE)$/$(INPATH)$/lib$/$(COMMONJAVALIBDEPN)
 APP1STDLIBS =\
 	$(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST) $(COMMONJAVALIBST)\
 	$(REGLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(SALLIB)
--- odk/source/unoapploader/unx/makefile.mk.old	2009-04-02 12:54:49.000000000 +0200
+++ odk/source/unoapploader/unx/makefile.mk	2009-04-16 15:50:34.000000000 +0200
@@ -57,7 +57,7 @@ APP1RPATH=NONE
 
 APP1TARGET= $(TARGET)
 
-APP1OBJS=   $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.obj
+APP1OBJS=   $(OBJ)$/unoapploader.obj $(SOLARPIECE)$/$(INPATH)$/lib$/findsofficepath.obj
 
 # --- Targets ------------------------------------------------------
 
--- odk/pack/gendocu/makefile.mk.old	2009-04-16 15:28:52.000000000 +0200
+++ odk/pack/gendocu/makefile.mk	2009-04-16 16:00:08.000000000 +0200
@@ -107,7 +107,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEA
 	-rm $(@:d:d)$/cpp.css
 	$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
 
-$(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f)
+$(JAVA_SRC_FILES) : $(SOLARPIECE)$/$(INPATH)$/bin$/$$(@:f)
 	-$(MKDIRHIER) $(@:d)        
 	$(MY_COPY) $< $@
 	cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)

Places

File ooo-build-3.0.99.4-piece-sdk-with-ure.diff of Package OpenOffice_org-ure

Places