notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

if/else indentation in Makefile

Browse source 
Improve readability of part of the Makefile.
This commit is contained in:
Bill Kendrick 2018-08-19 20:39:58 -07:00
parent 11bcb019b8
commit 5e88f0473b
1 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Makefile
View file

@ -1,10 +1,10 @@
# Tux Paint - A simple drawing program for children. # Tux Paint - A simple drawing program for children.
# Copyright (c) 2002-2017 by Bill Kendrick and others # Copyright (c) 2002-2018
# bill@newbreedsoftware.com # Various contributors (see AUTHORS.txt)
# http://www.tuxpaint.org/ # http://www.tuxpaint.org/
# June 14, 2002 - December 30, 2017 # June 14, 2002 - August 19, 2018
# The version number, for release: # The version number, for release:
@ -21,30 +21,30 @@ MAGIC_API_VERSION:=0x00000003
SYSNAME:=$(shell uname -s) SYSNAME:=$(shell uname -s)
ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32) ifeq ($(findstring MINGW32, $(SYSNAME)),MINGW32)
OS:=windows OS:=windows
GPERF:=/usr/bin/gperf GPERF:=/usr/bin/gperf
else else
ifeq ($(SYSNAME),Darwin) ifeq ($(SYSNAME),Darwin)
OS:=osx OS:=osx
GPERF:=/usr/bin/gperf GPERF:=/usr/bin/gperf
else else
ifeq ($(SYSNAME),BeOS) ifeq ($(SYSNAME),BeOS)
OS:=beos OS:=beos
GPERF:=$(shell finddir B_USER_BIN_DIRECTORY)/gperf GPERF:=$(shell finddir B_USER_BIN_DIRECTORY)/gperf
else else
ifeq ($(SYSNAME),Haiku) ifeq ($(SYSNAME),Haiku)
OS:=beos OS:=beos
GPERF:=$(shell finddir B_SYSTEM_BIN_DIRECTORY)/gperf GPERF:=$(shell finddir B_SYSTEM_BIN_DIRECTORY)/gperf
STDC_LIB:=-lstdc++ STDC_LIB:=-lstdc++
ifeq ($(shell gcc --version | cut -c 1-6),2.95.3) ifeq ($(shell gcc --version | cut -c 1-6),2.95.3)
STDC_LIB:=-lstdc++.r4 STDC_LIB:=-lstdc++.r4
endif endif
else else
OS:=linux OS:=linux
GPERF:=/usr/bin/gperf GPERF:=/usr/bin/gperf
endif endif
endif endif
endif endif
endif endif
# change to sdl-console to build a console version on Windows # change to sdl-console to build a console version on Windows
@ -140,11 +140,11 @@ PREFIX:=$($(OS)_PREFIX)
# macOS is set up as a bundle, with all files under 'Contents'. # macOS is set up as a bundle, with all files under 'Contents'.
# "TuxPaint-1" is the OLPC XO name. Installing to ./ is bad! # "TuxPaint-1" is the OLPC XO name. Installing to ./ is bad!
ifeq ($(OS),osx) ifeq ($(OS),osx)
DESTDIR:=$(BUNDLE)/Contents/ DESTDIR:=$(BUNDLE)/Contents/
else ifeq ($(PREFIX),./) else ifeq ($(PREFIX),./)
DESTDIR:=TuxPaint-1 DESTDIR:=TuxPaint-1
else else
DESTDIR:=$(PKG_ROOT) DESTDIR:=$(PKG_ROOT)
endif endif
# Program: # Program: