diff --git a/build_num b/build_num index aae135814..81f6dc017 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 2261 +#define BUILD_NUM 2262 diff --git a/qmake.inc.in b/qmake.inc.in index b014aae16..d6019f7e8 100644 --- a/qmake.inc.in +++ b/qmake.inc.in @@ -50,14 +50,11 @@ unix { datadir.path = @DATADIR@ res.path = @RES_DIR@ - res_os.path = @RES_DIR@/os/ - res_platform.path = @RES_DIR@/platform/ + res_os.path = $$res.path/os/ + res_platform.path = $$res.path/platform/ + res_help_C.path = $$res.path/help/C + res_help_en_US.path = $$res.path/help/en_US res_desktop.path = @DATADIR@/applications/ - res_help_C.path = @RES_DIR@/help/C - res_help_en_US.path = @RES_DIR@/help/en_US - res_configlets_linux24.path = @RES_DIR@/configlets/linux24 - res_configlets_ipcop.path = @RES_DIR@/configlets/ipcop - res_configlets_sveasoft.path = @RES_DIR@/configlets/sveasoft INSTALLS += res INSTALLS += res_os diff --git a/src/res/res.pro b/src/res/res.pro index cb4d20cd9..aec749e43 100644 --- a/src/res/res.pro +++ b/src/res/res.pro @@ -30,22 +30,10 @@ res_os.files = os/*.xml res_platform.files = platform/*.xml res_help_en_US.files = help/en_US/*.html help/en_US/*.png help/en_US/*.jpg -#dirs = $$system("ls configlets") -#for(dir, dirs) { -# message($${dir}) -# $${configlet$${dir}}.files = $$system("ls configlets/$$dir/*") -# message($$configlet$$dir.files) -# $${configlet$${dir}}.path = $$PREFIX/resources/configlets/$$dir -# message($$configlet$${dir}.path) -# configlet$${dir}.path = $$PREFIX/resources/configlets/$$dir -# configlet\$\$\{dir\}.path = $$PREFIX/resources/configlets/$$dir -# INSTALLS += configlet$${dir} -#} - -res_configlets.path = $$PREFIX/resources/configlets -unix:res_configlets.commands = tar cf - --exclude .svn {*.xml,os/*.xml,platform/*.xml,help,configlets} | \ - tar -C $${PREFIX}/resources/ -xf - - +unix { + res_configlets.path = $$res.path/configlets + res_configlets.files = $$system(find configlets/* -path \'*/.svn*\' -prune -o -type d -print) +} INSTALLS -= target INSTALLS += res