summaryrefslogtreecommitdiff
path: root/patches/dev300/piece-offapi.diff
blob: 5213a07ab9de54f7703e0d4dbd6eceda12991f34 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
--- offapi/util/makefile.mk.orig	2009-10-16 20:01:41.000000000 +0200
+++ offapi/util/makefile.mk	2009-10-19 14:59:28.000000000 +0200
@@ -154,7 +154,7 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck
 
 UNOTYPE_STATISTICS=$(MISC)$/unotype_statistics.txt
 
-REGVIEWTOOL=$(SOLARBINDIR)$/regview$(EXECPOST)
+REGVIEWTOOL=$(SOLARPIECE)/$(INPATH)/bin/regview$(EXECPOST)
 
 # --- Targets ------------------------------------------------------
 
@@ -163,15 +163,16 @@ ALLTAR : $(UCR)$/types.db \
        $(REGISTRYCHECKFLAG) \
        $(UNOTYPE_STATISTICS)
 
-$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
+UDKRDB=$(SOLARPIECE)$/$(INPATH)$/bin
+$(UCR)$/types.db : $(UCR)$/offapi.db $(UDKRDB)$/udkapi.rdb
     @-$(RM) $(REGISTRYCHECKFLAG)
     @$(GNUCOPY) -f $(UCR)$/offapi.db $@
-    $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
+    $(COMMAND_ECHO)$(REGMERGE) $@ / $(UDKRDB)$/udkapi.rdb
 
-$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
+$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(UDKRDB)$/udkapi_doc.rdb
     @-$(RM) $(REGISTRYCHECKFLAG)
     @$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
-    $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
+    $(COMMAND_ECHO)$(REGMERGE) $@ / $(UDKRDB)$/udkapi_doc.rdb
 
 #JSC: The type library has changed, all temporary not checked types are removed
 #     and will be check from now on.