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 /nss | |
| 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 'nss')
| -rw-r--r-- | nss/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index b1c38314f9e0..91c63d281e63 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -95,7 +95,7 @@ CONFIGURE_ACTION+= ; \ sed -e 's\#@prefix@\#$(OUTDIR)\#' -e 's\#@includedir@\#$(OUTDIR)/inc/mozilla/nss\#' -e 's\#@MOD_MAJOR_VERSION@\#$(VER_MAJOR)\#' -e 's\#@MOD_MINOR_VERSION@\#$(VER_MINOR)\#' -e 's\#@MOD_PATCH_VERSION@\#$(VER_PATCH)\#' mozilla/security/nss/nss-config.in > mozilla/security/nss/nss-config ; \ chmod a+x mozilla/security/nss/nss-config -.IF "$(GUI)"=="UNX" +.IF "$(OS)"!="WNT" .IF "$(OS)$(COM)"=="LINUXGCC" .IF "$(BUILD64)"=="1" # force 64-bit buildmode @@ -168,10 +168,10 @@ BUILD_ACTION+=NS_USE_GCC=1 BUILD_ACTION += NSS_USE_SYSTEM_SQLITE=1 .END -.ENDIF # "$(GUI)"=="UNX" +.ENDIF # "$(OS)"!="WNT" -.IF "$(GUI)"=="WNT" +.IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" @@ -255,7 +255,7 @@ OUT2BIN=mozilla/dist/out/lib/*$(DLLPOST) \ config/nspr-config \ mozilla/security/nss/nss-config -.ENDIF # "$(GUI)"=="WNT" +.ENDIF # "$(OS)"=="WNT" OUTDIR2INC=mozilla/dist/public/nss mozilla/dist/out/include |