[Libreoffice-commits] core.git: 2 commits - desktop/Package_scripts_install.mk desktop/Package_scripts.mk desktop/scripts readlicense_oo/CustomTarget_readme.mk

[Michael Stahl]

 desktop/Package_scripts.mk            |    6 +-----
 desktop/Package_scripts_install.mk    |    6 +-----
 desktop/scripts/ure-link              |    1 -
 readlicense_oo/CustomTarget_readme.mk |    2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 242668950059744d1ef6b54d30bf91fc10cd273d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 10 18:00:20 2013 +0200

    desktop: ure-link is installed by ure/Packge_install.mk already
    
    Change-Id: Ic575d340d0b3b42dc9b07790ab094c8ce6016329

diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index aa6dc5d..f47fc8c 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -9,11 +9,7 @@
 
 $(eval $(call gb_Package_Package,desktop_scripts,$(SRCDIR)/desktop/scripts))
 
-ifeq ($(OS),WNT)
-
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/ure-link,ure-link))
-
-else
+ifneq ($(OS),WNT)
 
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/gdbtrace,gdbtrace))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/sbase,sbase.sh))
diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk
index 3c7fbcb..c64c2bd 100644
--- a/desktop/Package_scripts_install.mk
+++ b/desktop/Package_scripts_install.mk
@@ -11,11 +11,7 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip
 
 $(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTDIR)))
 
-ifeq ($(OS),WNT)
-
-$(eval $(call gb_Package_add_file,desktop_scripts_install,bin/ure-link,ure-link))
-
-else
+ifneq ($(OS),WNT)
 
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/gdbtrace,gdbtrace))
 $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/sbase,sbase.sh))
diff --git a/desktop/scripts/ure-link b/desktop/scripts/ure-link
deleted file mode 100755
index 122de34..0000000
--- a/desktop/scripts/ure-link
+++ /dev/null
@@ -1 +0,0 @@
-URE
\ No newline at end of file
commit 18976a2d90f5dd000ad1f685ac7b8c42ed2b401c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Sep 10 17:03:17 2013 +0200

    use $(PRODUCTNAME) variable for README
    
    Change-Id: I0314112570ed9ef2090b25f1e19cb2c0a853da76

diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index a16becc..0d9c5ee 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -42,7 +42,7 @@ $(readlicense_oo_DIR)/readme.xrm : \
 endif
 
 readlicense_oo_README_SED := \
-	-e 's,$${PRODUCTNAME},LibreOffice,g' \
+	-e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
 	-e 's,$${PRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR),g' \
 
 $(readlicense_oo_DIR)/$(call gb_README,%) : \