summaryrefslogtreecommitdiff
path: root/reportbuilder/util/makefile.mk
diff options
context:
space:
mode:
authorOcke Janssen [oj] <Ocke.Janssen@sun.com>2010-06-22 11:27:46 +0200
committerOcke Janssen [oj] <Ocke.Janssen@sun.com>2010-06-22 11:27:46 +0200
commitfe8e4404a5310fe5cf0c6ea38a08562c48404f3b (patch)
tree83724362f7478e4a79553898c576cfa63df663f0 /reportbuilder/util/makefile.mk
parentb38d922de06075e7a1e37ffbad09ffd2065219cc (diff)
parent1a73871715b8fea151a2997f3014670bb0c51363 (diff)
srb1: merge from DEv300:m83
Diffstat (limited to 'reportbuilder/util/makefile.mk')
-rwxr-xr-x[-rw-r--r--]reportbuilder/util/makefile.mk16
1 files changed, 6 insertions, 10 deletions
diff --git a/reportbuilder/util/makefile.mk b/reportbuilder/util/makefile.mk
index 78d6b6993ffb..810686822593 100644..100755
--- a/reportbuilder/util/makefile.mk
+++ b/reportbuilder/util/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.21.2.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,8 +43,8 @@ EXTENSION_VERSION_BASE=1.2.1
.IF "$(L10N_framework)"==""
# ------------------------------------------------------------------
# calready set in util$/makefile.pmk
-# EXTENSIONNAME:=sun-report-builder
-EXTENSION_ZIPNAME:=sun-report-builder
+# EXTENSIONNAME:=report-builder
+EXTENSION_ZIPNAME:=report-builder
# create Extension -----------------------------
@@ -82,8 +78,8 @@ COMPONENT_OTR_FILES= \
$(EXTENSIONDIR)$/template$/en-US$/wizard$/report$/default.otr
COMPONENT_IMAGES= \
- $(EXTENSIONDIR)$/images$/em42.png \
- $(EXTENSIONDIR)$/images$/em42_hc.png
+ $(EXTENSIONDIR)$/images$/extension_32.png \
+ $(EXTENSIONDIR)$/images$/extension_32_h.png
COMPONENT_HTMLFILES = $(EXTENSIONDIR)$/THIRDPARTYREADMELICENSE.html \
$(EXTENSIONDIR)$/readme_en-US.html \
@@ -139,7 +135,7 @@ $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
-$(EXTENSIONDIR)$/images$/%.png : $(PRJ)$/images$/%.png
+$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@