aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 9 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 8bd42a27d7..79bf2b431e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ MODULES :=
MODULE_DIRS :=
# Load the make rules generated by configure
-include config.mk
+-include config.mk
CXXFLAGS:= -Wall $(CXXFLAGS)
CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
@@ -44,9 +44,14 @@ include $(srcdir)/Makefile.common
# check if configure has been run or has been changed since last run
config.mk: $(srcdir)/configure
- @echo "You need to run ./configure before you can run make"
- @echo "Either you haven't run it before or it has changed."
- @exit 1
+ifdef CONFIG_MK_IS_PRESENT
+ @echo "Running $(srcdir)/configure with the last specified parameters"
+ @sleep 2s
+ @LDFLAGS=$(SAVED_LDFLAGS) CXX=$(SAVED_CXX) CXXFLAGS=$(SAVED_CXXFLAGS) CPPFLAGS=$(SAVED_CPPFLAGS) \
+ $(srcdir)/configure $(SAVED_CONFIGFLAGS)
+else
+ $(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)
+endif
install: all
$(INSTALL) -d "$(DESTDIR)$(BINDIR)"