padmin/Module_padmin.mk | 2 +-
padmin/Package_inc.mk | 23 -----------------------
padmin/Package_padmin.mk | 26 ++++++++++++++++++++++++++
scp2/source/ooo/common_brand.scp | 6 +++---
sd/Module_sd.mk | 1 -
sd/Package_inc.mk | 14 --------------
6 files changed, 30 insertions(+), 42 deletions(-)
New commits:
commit 80db6f58ef6bbfff15c5702ad2bf852eceeea818
Author: David Tardon <dtar...@redhat.com>
Date: Sat Apr 20 07:33:10 2013 +0200
gbuild: drop unneeded package
Change-Id: I9d0fa82302f07b2ae3820d416556d2c4e40f70df
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index b6486b7..5b19b2c 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_Module_add_targets,sd,\
Library_sdd \
Library_sdfilt \
Library_sdui \
- Package_inc \
Package_web \
Package_xml \
UIConfig_sdraw \
diff --git a/sd/Package_inc.mk b/sd/Package_inc.mk
deleted file mode 100644
index b08faff..0000000
--- a/sd/Package_inc.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,sd_inc,$(SRCDIR)/sd/inc))
-
-$(eval $(call gb_Package_add_file,sd_inc,inc/sd/sddll.hxx,sddll.hxx))
-
-# vim: set noet sw=4 ts=4:
commit 59dbfa41d31822dd7ffde320bf43463be82fbfcb
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Apr 23 23:19:18 2013 +0200
padmin: let Package deliver to $INSTDIR
Change-Id: I824179f2040df917544c253712eb3afe19ec9fb1
diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk
index 9407b97..2b5e07b 100644
--- a/padmin/Module_padmin.mk
+++ b/padmin/Module_padmin.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,padmin,\
Executable_spadmin.bin \
Library_spa \
AllLangResTarget_spa \
- Package_inc \
+ Package_padmin \
UIConfig_spa \
))
endif
diff --git a/padmin/Package_inc.mk b/padmin/Package_padmin.mk
similarity index 82%
rename from padmin/Package_inc.mk
rename to padmin/Package_padmin.mk
index 6c69229..7a9dde1 100644
--- a/padmin/Package_inc.mk
+++ b/padmin/Package_padmin.mk
@@ -17,7 +17,10 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-$(eval $(call gb_Package_Package,padmin_src,$(SRCDIR)/padmin/source))
-$(eval $(call gb_Package_add_file,padmin_src,bin/spadmin,spadmin.sh))
+$(eval $(call gb_Package_Package,padmin,$(SRCDIR)/padmin/source))
+
+$(eval $(call gb_Package_set_outdir,padmin,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,padmin,program/spadmin,spadmin.sh))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 0a6a523..60024a7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -500,9 +500,9 @@ End
#if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
File gid_Brand_File_Bin_Spadmin
BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "spadmin";
- Styles = (PACKED);
+ Dir = FILELIST_DIR;
+ Name = "padmin.filelist";
+ Styles = (PACKED, FILELIST);
End
#endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
