[Libreoffice-commits] .: desktop/Module_desktop.mk desktop/Package_scripts.mk desktop/scripts

[Jan Holesovsky]

 desktop/Module_desktop.mk      |    2 +-
 desktop/Package_scripts.mk     |    9 +++++++++
 desktop/scripts/odf-basis-link |    1 -
 desktop/scripts/so-basis-link  |    1 -
 4 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit a32da8aba636dd515ac74c9b2234e8ff83d47055
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Sep 20 09:17:00 2011 +0200

    Deliver basis-link and ure-link.

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 683bedc..0348f47 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_unopkgapp \
     Package_branding \
     Package_intro \
+    Package_scripts \
     Pagein_calc \
     Pagein_common \
     Pagein_draw \
@@ -98,7 +99,6 @@ else
 $(eval $(call gb_Module_add_targets,desktop,\
     Executable_soffice.bin \
     Executable_unopkg.bin \
-    Package_scripts \
 ))
 
 ifeq ($(OS),MACOSX)
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 1bc67b7..a59ad5b 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -25,6 +25,13 @@
 
 $(eval $(call gb_Package_Package,desktop_scripts,$(SRCDIR)/desktop/scripts))
 
+ifeq ($(OS),WNT)
+
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/basis-link,basis-link))
+$(eval $(call gb_Package_add_file,desktop_scripts,bin/ure-link,ure-link))
+
+else
+
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/gdbtrace,gdbtrace))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/mozwrapper,mozwrapper.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/sbase,sbase.sh))
@@ -44,4 +51,6 @@ $(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh))
 
 endif
 
+endif
+
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/scripts/odf-basis-link b/desktop/scripts/odf-basis-link
deleted file mode 100755
index 3af8420..0000000
--- a/desktop/scripts/odf-basis-link
+++ /dev/null
@@ -1 +0,0 @@
-Basis
\ No newline at end of file
diff --git a/desktop/scripts/so-basis-link b/desktop/scripts/so-basis-link
deleted file mode 100755
index 3af8420..0000000
--- a/desktop/scripts/so-basis-link
+++ /dev/null
@@ -1 +0,0 @@
-Basis
\ No newline at end of file