summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile10
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index c53727e44b..0870fd4651 100644
--- a/Makefile
+++ b/Makefile
@@ -507,15 +507,14 @@ GIT-VERSION-FILE: FORCE
-include GIT-VERSION-FILE
# CFLAGS and LDFLAGS are for the users to override from the command line.
-
CFLAGS = -g -O2 -Wall
LDFLAGS =
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
-
-# Create as necessary, replace existing, make ranlib unneeded.
ARFLAGS = rcs
+# Set our default configuration.
+#
# Among the variables below, these:
# gitexecdir
# template_dir
@@ -560,6 +559,7 @@ perllibdir_relative = $(patsubst $(prefix)/%,%,$(perllibdir))
export prefix bindir sharedir sysconfdir gitwebdir perllibdir localedir
+# Set our default programs
CC = cc
AR = ar
RM = rm -f
@@ -587,10 +587,6 @@ SP_EXTRA_FLAGS =
SPATCH_FLAGS = --all-includes --patch .
-
-
-### --- END CONFIGURATION SECTION ---
-
BASIC_CFLAGS = -I.
BASIC_LDFLAGS =