From 717c9643bdb991eec87540fb3102c6ef6a25fce8 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 10 May 2013 14:06:33 +0200 Subject: More gb_PROGRAMDIRNAME clean up Change-Id: I5af86e15bcb8958a680e7309f13d7a865f29d7a9 --- instsetoo_native/Package_config.mk | 2 +- instsetoo_native/Package_rdb.mk | 4 ++-- instsetoo_native/Package_setup.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'instsetoo_native') diff --git a/instsetoo_native/Package_config.mk b/instsetoo_native/Package_config.mk index 01c708b8ef54..128b653a78b1 100644 --- a/instsetoo_native/Package_config.mk +++ b/instsetoo_native/Package_config.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,instsetoo_native_config,$(SRCDIR)/instsetoo_nat $(eval $(call gb_Package_set_outdir,instsetoo_native_config,$(INSTDIR))) -$(eval $(call gb_Package_add_files,instsetoo_native_config,program,\ +$(eval $(call gb_Package_add_files,instsetoo_native_config,$(gb_PROGRAMDIRNAME),\ bootstraprc \ fundamentalrc \ unorc \ diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk index 9e28f068f6d8..6bbfd3b1dc28 100644 --- a/instsetoo_native/Package_rdb.mk +++ b/instsetoo_native/Package_rdb.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,instsetoo_native_rdb,$(OUTDIR))) $(eval $(call gb_Package_set_outdir,instsetoo_native_rdb,$(INSTDIR))) -$(eval $(call gb_Package_add_files,instsetoo_native_rdb,program/services,\ +$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/services,\ xml/services.rdb \ $(call gb_Helper_optional,POSTGRESQL,$(if $(filter YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \ $(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\ @@ -22,7 +22,7 @@ $(eval $(call gb_Package_add_files,instsetoo_native_rdb,program/services,\ ) \ )) -$(eval $(call gb_Package_add_files,instsetoo_native_rdb,program/types,\ +$(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/types,\ bin/offapi.rdb \ bin/oovbaapi.rdb \ )) diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index aaba1e51963d..b2a2c9908773 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_g $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR))) -$(eval $(call gb_Package_add_files,instsetoo_native_setup,program,\ +$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\ ooenv \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \ versionrc \ -- cgit