[Notion-devel] [PATCH 2/3] build: whitespace cleanup in system-autodetect

[Olof J. <ol...@et...>]

---
There were some minor inconsistencies, and I figured while I'm at
it... ;-)

Regarding the whitespace around operators, it is my humble
opinion that using whitespace around operators makes it easier to
read makefiles and other code. Of course, this is my subjective
opinion, so drop the patch if you don't agree :-).

---
 system-autodetect.mk |   56 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/system-autodetect.mk b/system-autodetect.mk
index fef949b..a2236d2 100644
--- a/system-autodetect.mk
+++ b/system-autodetect.mk
@@ -15,25 +15,25 @@ PREFIX ?= /usr/local
 # probably do not want to modify the following directories:
 
 # Main binaries
-BINDIR=$(PREFIX)/bin
+BINDIR = $(PREFIX)/bin
 # Some .lua files and ion-* shell scripts
-SHAREDIR=$(PREFIX)/share/notion
+SHAREDIR = $(PREFIX)/share/notion
 # Manual pages
-MANDIR=$(PREFIX)/share/man
+MANDIR = $(PREFIX)/share/man
 # Some documents
-DOCDIR=$(PREFIX)/share/doc/notion
+DOCDIR = $(PREFIX)/share/doc/notion
 # Nothing at the moment
-LIBDIR=$(PREFIX)/lib
+LIBDIR = $(PREFIX)/lib
 # Modules
-MODULEDIR=$(LIBDIR)/notion/mod
+MODULEDIR = $(LIBDIR)/notion/mod
 # Compiled Lua source code
-LCDIR=$(LIBDIR)/notion/lc
+LCDIR = $(LIBDIR)/notion/lc
 # ion-completefile (does not belong in SHAREDIR being a binary file)
-EXTRABINDIR=$(LIBDIR)/notion/bin
+EXTRABINDIR = $(LIBDIR)/notion/bin
 # For notion-completeman system-wide cache
-VARDIR=/var/cache/notion
+VARDIR = /var/cache/notion
 # Message catalogs
-LOCALEDIR=$(PREFIX)/share/locale
+LOCALEDIR = $(PREFIX)/share/locale
 
 # Configuration .lua files. Overrideable, as config files are usually
 # not placed under $(PREFIX).
@@ -63,7 +63,7 @@ endif
 
 # Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this
 # setting (for e.g. Lua, when not instructed by pkg-config).
-DL_LIBS=-ldl
+DL_LIBS = -ldl
 
 
 ##
@@ -81,16 +81,16 @@ X11_PREFIX ?= /usr/X11R6
 # SunOS/Solaris
 #X11_PREFIX ?= /usr/openwin
 
-X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
-X11_INCLUDES=-I$(X11_PREFIX)/include
+X11_LIBS = -L$(X11_PREFIX)/lib -lX11 -lXext
+X11_INCLUDES = -I$(X11_PREFIX)/include
 
 # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
 # The following setting  should  work around that situation.
 DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
 
 # Use the Xutf8 routines (XFree86 extension) instead of the Xmb routines
-# in an UTF-8 locale. (No, you don't need this in UTF-8 locales, and 
-# most likely don't even want. It's only there because both Xmb and 
+# in an UTF-8 locale. (No, you don't need this in UTF-8 locales, and
+# most likely don't even want. It's only there because both Xmb and
 # Xutf8 routines are broken, in different ways.)
 #DEFINES += -DCF_DE_USE_XUTF8
 
@@ -104,7 +104,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
 ##
 
 # If you're on an archaic system (such as relatively recent *BSD releases)
-# without even dummy multibyte/widechar and localisation support, you may 
+# without even dummy multibyte/widechar and localisation support, you may
 # have to uncomment the following line:
 #DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT
 
@@ -122,7 +122,7 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
 
 # You may uncomment this if you know that your system C libary provides
 # asprintf and  vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not
-# defined, an implementation provided in libtu/sprintf_2.2/ is used. 
+# defined, an implementation provided in libtu/sprintf_2.2/ is used.
 HAS_SYSTEM_ASPRINTF ?= 1
 
 # The following setting is needed with GNU libc for clock_gettime and the
@@ -142,32 +142,32 @@ EXTRA_LIBS += -lrt
 
 
 ##
-## C compiler. 
+## C compiler.
 ##
 
 CC ?= gcc
 
 # Same as '-Wall -pedantic' without '-Wunused' as callbacks often
 # have unused variables.
-WARN=	-W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
-	-Wtrigraphs -Wformat -Wchar-subscripts \
-	-Wparentheses -pedantic -Wuninitialized
+WARN =  -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
+        -Wtrigraphs -Wformat -Wchar-subscripts \
+        -Wparentheses -pedantic -Wuninitialized
 
 CFLAGS += -Os $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) \
           -DHAS_SYSTEM_ASPRINTF=$(HAS_SYSTEM_ASPRINTF)
 
 LDFLAGS += -Wl,--as-needed $(LIBS) $(EXTRA_LIBS)
-EXPORT_DYNAMIC=-Xlinker --export-dynamic
+EXPORT_DYNAMIC = -Xlinker --export-dynamic
 
 # The following options are mainly for development use and can be used
 # to check that the code seems to conform to some standards. Depending
 # on the version and vendor of you libc, the options may or may not have
 # expected results. If you define one of C99_SOURCE or XOPEN_SOURCE, you
-# may also have to define the other. 
+# may also have to define the other.
 
 #C89_SOURCE=-ansi
 
-POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L
+POSIX_SOURCE = -D_POSIX_C_SOURCE=200112L
 
 # Most systems
 #XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED
@@ -176,7 +176,7 @@ POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L
 
 #C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY
 
-# The -DCF_HAS_VA_COPY option should allow for some optimisations, and 
+# The -DCF_HAS_VA_COPY option should allow for some optimisations, and
 # in some cases simply defining
 #C99_SOURCE=-DCF_HAS_VA_COPY
 # might allow for those optimisations to be taken without any  special
@@ -187,9 +187,9 @@ POSIX_SOURCE=-D_POSIX_C_SOURCE=200112L
 ## make depend
 ##
 
-DEPEND_FILE=.depend
-DO_MAKE_DEPEND=$(CC) -MM $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
-MAKE_DEPEND=$(DO_MAKE_DEPEND) $(SOURCES) > $(DEPEND_FILE)
+DEPEND_FILE = .depend
+DO_MAKE_DEPEND = $(CC) -MM $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+MAKE_DEPEND = $(DO_MAKE_DEPEND) $(SOURCES) > $(DEPEND_FILE)
 
 
 ##
-- 
1.7.10.4