Corrected build utilities.
This commit is contained in:
parent
324a65a762
commit
b144d15c00
4
Makefile
4
Makefile
|
@ -11,7 +11,7 @@ include Makefile.vars Makefile.msg
|
|||
# General targets #
|
||||
#******************************************************************************#
|
||||
# Make it all
|
||||
all: all-bins all-doc
|
||||
all: all-bins $(if $(INSTALL_MANPAGES),all-doc)
|
||||
|
||||
# Mostly clean
|
||||
mostlyclean: mostlyclean-bins
|
||||
|
@ -31,7 +31,7 @@ mrproper: clean
|
|||
re: clean all
|
||||
|
||||
# Install it all
|
||||
install: install-bins install-doc
|
||||
install: install-bins $(if $(INSTALL_MANPAGES),install-doc)
|
||||
|
||||
# Uninstall it all
|
||||
uninstall: uninstall-bins uninstall-doc
|
||||
|
|
|
@ -4,9 +4,8 @@
|
|||
#******************************************************************************#
|
||||
-include Makefile.cfg
|
||||
|
||||
# Correct target and adapt
|
||||
# Correct target
|
||||
TARGET := $(if $(TARGET),$(TARGET)-)
|
||||
FOR_WINDOWS := $(if $(findstring mingw,$(TARGET)),y)
|
||||
|
||||
#******************************************************************************#
|
||||
# Project main information #
|
||||
|
|
|
@ -6,18 +6,15 @@ cd "$(dirname "$0")"
|
|||
# Project variables
|
||||
name="$(make -s getname)"
|
||||
version="$(make -s getversion)"
|
||||
|
||||
# Maintainer
|
||||
maintainer="$(make -s getmaintainer)"
|
||||
|
||||
# Target
|
||||
target=""
|
||||
|
||||
# Make options
|
||||
make_full_log=
|
||||
more_warnings=
|
||||
|
||||
# Build options
|
||||
target=
|
||||
windows=
|
||||
default_zoom=8
|
||||
default_storage=fls0
|
||||
|
||||
|
@ -136,7 +133,7 @@ if [ ! $prefix_set ] && [ $target ]; then
|
|||
fi
|
||||
|
||||
# Check MS-Windows targets
|
||||
case "$target" in *-mingw32) windows=y ;;
|
||||
case "$target" in *-mingw32) windows=y ;; esac
|
||||
|
||||
# Evaluate variables
|
||||
for var in prefix bindir mandir; do
|
||||
|
@ -146,6 +143,9 @@ done
|
|||
# Check if is on Cygwin
|
||||
[ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ] && windows=y
|
||||
|
||||
# If on MS-Windows, do not make the manpages.
|
||||
[ "$windows" ] && install_manpages=
|
||||
|
||||
#******************************************************************************#
|
||||
# Create Makefile configuration #
|
||||
#******************************************************************************#
|
||||
|
@ -166,6 +166,7 @@ cat <<EOF
|
|||
|
||||
# Build options
|
||||
TARGET := $target
|
||||
FOR_WINDOWS := $windows
|
||||
DEFAULT_ZOOM := $default_zoom
|
||||
DEFAULT_STORAGE := $default_storage
|
||||
|
||||
|
|
Reference in New Issue