From 7a56eef989b828c495d34c34de99d1b863f223e2 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 5 Apr 2012 21:03:31 +0200 Subject: Clean up optional online update module * The updatecheckui lib is part of that module; should its scp entry also be marked ComponentCondition="ISCHECKFORPRODUCTUPDATES=1"? * unpack_update (and other scripts as well?) need only be generated if ENABLE_ONLINE_UPDATE. * It is inconsistent that there is a distinct onlineupdate.xcd not merged into main.xcd, while the updchk and updatecheckui component files are merged into the global services.rdb. * The updchk res file should also go into (a resource sub-module of) the optional online update module. --- setup_native/scripts/makefile.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'setup_native') diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk index 61dc0b786bf3..7a03660ad858 100644 --- a/setup_native/scripts/makefile.mk +++ b/setup_native/scripts/makefile.mk @@ -42,10 +42,13 @@ UNIXTEXT= \ $(BIN)$/javaloader.sh \ $(BIN)$/register_extensions \ $(BIN)$/deregister_extensions \ - $(BIN)$/unpack_update.sh \ $(BIN)$/update.sh \ $(BIN)$/downloadscript.sh +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" +UNIXTEXT += $(BIN)$/unpack_update.sh +.END + NOARCH=$(BIN)$/noarch FAKEDB=$(NOARCH)/fake-db-1.0-0.noarch.rpm FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root -- cgit