summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-08-01 07:56:27 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-08-01 07:56:27 +0000
commit32f8d7eda73f6db841f894f7179ec9ef3e3c1939 (patch)
treebee625cafd9ec2be577708f29a0d7e2b0a626580 /setup_native
parent1464280c4c4b4f0f45f4c54d8fbe5dd7ac94c6e7 (diff)
INTEGRATION: CWS register30 (1.4.52); FILE MERGED
2008/07/29 13:42:45 obr 1.4.52.2: #158122# now also for Mac OS X 2008/07/29 05:03:20 obr 1.4.52.1: #158122# new style registration for sun provided builds
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/registry/data/org/openoffice/Office/makefile.mk13
1 files changed, 4 insertions, 9 deletions
diff --git a/setup_native/registry/data/org/openoffice/Office/makefile.mk b/setup_native/registry/data/org/openoffice/Office/makefile.mk
index ce86a2e8d006..aa1c37db6eab 100644
--- a/setup_native/registry/data/org/openoffice/Office/makefile.mk
+++ b/setup_native/registry/data/org/openoffice/Office/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
# This file is part of OpenOffice.org.
#
@@ -31,7 +31,7 @@
PRJ=..$/..$/..$/..$/..
PRJNAME=setup_native
-TARGET=data_stclient
+TARGET=data_registration
PACKAGE=org.openoffice.Office
ABSXCSROOT=$(SOLARXMLDIR)
@@ -47,13 +47,8 @@ PROCESSORDIR=$(SOLARBINDIR)
.IF "$(BUILD_SPECIAL)"!=""
-.IF "$(OS)"!="MACOSX"
XCUFILES= \
Jobs.xcu
-.ELSE
-dummy:
- @echo "Nothing to build"
-.ENDIF
MODULEFILES=
@@ -63,7 +58,7 @@ PACKAGEDIR=$(subst,.,$/ $(PACKAGE))
SPOOLDIR=$(MISC)$/registry$/spool
MYXCUFILES= \
- $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-stclient.xcu
+ $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-registration.xcu
.ELSE # "$(BUILD_SPECIAL)"!=""
@@ -78,7 +73,7 @@ dummy:
ALLTAR : $(MYXCUFILES)
-$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-stclient.xcu : $(PROCESSOUT)$/registry$/data$/$/$(PACKAGEDIR)$/Jobs.xcu
+$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-registration.xcu : $(PROCESSOUT)$/registry$/data$/$/$(PACKAGEDIR)$/Jobs.xcu
@-$(MKDIRHIER) $(@:d)
@$(COPY) $< $@