diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-12 01:07:09 +0200 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-25 17:53:25 +0000 |
| commit | c29098917a1118d4b435df2b5f542adc8505e123 (patch) | |
| tree | f9407e3cf21b49abb40d536f73364abbddcb5ea3 /sysui | |
| parent | e5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (diff) | |
Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.
Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/share/makefile.mk | 4 | ||||
| -rw-r--r-- | sysui/util/checksize.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index 4614e8bc6a50..21c919adb278 100644 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -132,10 +132,10 @@ ICONDEPN = \ .INCLUDE : target.mk -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES) $(COMMONMISC)$/{$(PRODUCTLIST)}$/build.flag -.ENDIF # "$(GUI)"=="UNIX" +.ENDIF # "$(OS)"!="WNT" # # Copy/patch the .desktop files to the output tree and diff --git a/sysui/util/checksize.pl b/sysui/util/checksize.pl index da4104b29a95..9daf2625829d 100644 --- a/sysui/util/checksize.pl +++ b/sysui/util/checksize.pl @@ -70,7 +70,7 @@ sub check #04.02.2005 13:40 my $file = shift; print "$path$file\n" if ((-e "$path$file") && $is_debug); # don't check dpc,flag,rpmflag,sdf [obj for UNX] files, or etc subdirectory - return if ( ($file =~ /.+\.(dpc|\w*?flag)/) || ($file =~ /.+\.obj/ && $ENV{GUI} eq 'UNX') || ($path =~ /.+etc/) || ($path =~ /.+logs/) || ($file =~ /.+sdf/) ); + return if ( ($file =~ /.+\.(dpc|\w*?flag)/) || ($file =~ /.+\.obj/ && $ENV{OS} ne 'WNT') || ($path =~ /.+etc/) || ($path =~ /.+logs/) || ($file =~ /.+sdf/) ); if ( -z "$path$file" ) { print "Error: $path$file 0 Bytes!\n"; $err++; |