Makefile.in: Compile/Install/Uninstall ODT Help Browser

diff --git a/source/Makefile.in b/source/Makefile.in
index e5c6960..85a7438 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -11,7 +11,8 @@ XAB_OUT=xestiaab
 BMCO_HELP=tools/bitmapcode.helper\r
 BMCO_DIR=../bitmaps\r
 \r
-ODTHELPBROWSER=tools/odthelpbrowser/odthelpbrowser\r
+ODTHELPBROWSER_OUT=odthelpbrowser\r
+ODTHELPBROWSER_PATH=tools/odthelpbrowser/$(ODTHELPBROWSER_OUT)\r
 \r
 MAINOBJS=main.o convert.o\r
 CEOBJS=contacteditor/frmContactEditor.o \\r
@@ -85,6 +86,7 @@ ODTHELPBROWSEROBJS=tools/odthelpbrowser/main.o \
 \r
 default:\r
        $(MAKE) bitmaphelper\r
+       $(MAKE) odthelpbrowser\r
        $(MAKE) xestiaab\r
 \r
 xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \\r
@@ -123,7 +125,7 @@ widgetobjs: $(WIDGETOBJS)
 imexobjs: $(IMEXOBJS)\r
 \r
 clean:\r
-       rm -f $(XAB_OUT) $(BMCO_HELP) $(ODTHELPBROWSER) \\r
+       rm -f $(XAB_OUT) $(BMCO_HELP) $(ODTHELPBROWSER_PATH) \\r
        tools/bitmapcode.o *.o vcard/*.o common/*.o contacteditor/*.o \\r
        search/*.o widgets/*.o export/*.o import/*.o actmgr/*.o \\r
        contacteditor/cdo/*.o tests/Temp* tests/*.o tests/classes/*.o \\r
@@ -147,7 +149,7 @@ bitmaphelper: bitmaphelperobjs
 odthelpbrowserobjs: $(ODTHELPBROWSEROBJS)\r
 \r
 odthelpbrowser: odthelpbrowserobjs\r
-       $(CPP) $(CPPFLAGS) $(ODTHELPBROWSEROBJS) -o $(ODTHELPBROWSER) $(CPPLIBS)\r
+       $(CPP) $(CPPFLAGS) $(ODTHELPBROWSEROBJS) -o $(ODTHELPBROWSER_PATH) $(CPPLIBS)\r
 \r
 install-docs:\r
        #TODO: Add @PREFIX@ for docs, xestiaab and man page\r
@@ -156,6 +158,7 @@ install-docs:
 \r
 install: install-docs\r
        cp $(XAB_OUT) @BINDIR@/$(XAB_OUT)\r
+       cp $(ODTHELPBROWSER_PATH) @BINDIR@/$(ODTHELPBROWSER_OUT)\r
        cp xestiaab.1 @DATAROOTDIR@/man/man1/xestiaab.1\r
 \r
 uninstall-docs:\r
@@ -163,6 +166,7 @@ uninstall-docs:
 \r
 uninstall: uninstall-docs\r
        rm @BINDIR@/$(XAB_OUT)\r
+       cp @BINDIR@/$(ODTHELPBROWSER_OUT)\r
        rm @DATAROOTDIR@/man/man1/xestiaab.1\r
 \r
 test:\r