[Libreoffice-commits] core.git: setup_native/Package_scripts_generated.mk

[Stephan Bergmann]

 setup_native/Package_scripts_generated.mk |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f5c015bb5566000838fbc8d2e6d509b143ab026b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 12 11:21:23 2013 +0100

    More setup_native fixes for --enable-epm Linux/RPM post gbuild'ification
    
    Change-Id: I27e0e68ebc27dd89c254793e670d0bf5f48fe57e

diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk
index df350e4..0b2a301 100644
--- a/setup_native/Package_scripts_generated.mk
+++ b/setup_native/Package_scripts_generated.mk
@@ -10,15 +10,15 @@
 $(eval $(call gb_Package_Package,scripts_generated,$(call gb_CustomTarget_get_workdir,setup_native/scripts)))
 
 ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Package_add_file,scripts,bin/userscripts/install,install))
-$(eval $(call gb_Package_add_file,scripts,bin/userscripts/uninstall,uninstall))
+$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install))
+$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall))
 endif
 
 ifeq ($(OS),LINUX)
-ifneq ($(filter-out rpm,$(PKGFORMAT)),)
-$(eval $(call gb_Package_add_file,scripts,bin/userscripts/install,install))
-$(eval $(call gb_Package_add_file,scripts,bin/userscripts/uninstall,uninstall))
-$(eval $(call gb_Package_add_file,scripts,bin/openoffice-userland-1.0-0.noarch.rpm,fake-db-1.0-0.noarch.rpm))
+ifneq ($(filter rpm,$(PKGFORMAT)),)
+$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install))
+$(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall))
+$(eval $(call gb_Package_add_file,scripts_generated,bin/openoffice-userland-1.0-0.noarch.rpm,noarch/fake-db-1.0-0.noarch.rpm))
 endif
 endif
 # vim: set noet sw=4 ts=4: