aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--Makefile.native12
-rw-r--r--config.h (renamed from config.def.h)0
3 files changed, 6 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index f1aed0f..5e87f4f 100644
--- a/Makefile
+++ b/Makefile
@@ -13,18 +13,14 @@ else
LDLIBS += -lncurses
endif
-DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
-LOCALCONFIG = config.h
+DISTFILES = nlay nnn.c config.h nnn.1 Makefile README.md LICENSE
SRC = nnn.c
BIN = nnn
PLAYER = nlay
all: $(BIN) $(PLAYER)
-$(LOCALCONFIG): config.def.h
- cp config.def.h $@
-
-$(SRC): $(LOCALCONFIG)
+$(SRC): config.h
$(BIN): $(SRC)
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
diff --git a/Makefile.native b/Makefile.native
index 8377972..ab832de 100644
--- a/Makefile.native
+++ b/Makefile.native
@@ -1,6 +1,6 @@
VERSION = 1.2
-PREFIX = /usr/local
+PREFIX ?= /usr/local
MANPREFIX = $(PREFIX)/share/man
CFLAGS += -O3 -march=native -Wall -Wextra -Wno-unused-parameter
@@ -13,21 +13,17 @@ else
LDLIBS += -lncurses
endif
-DISTFILES = nlay nnn.c config.def.h nnn.1 Makefile README.md LICENSE
-LOCALCONFIG = config.h
+DISTFILES = nlay nnn.c config.h nnn.1 Makefile README.md LICENSE
SRC = nnn.c
BIN = nnn
PLAYER = nlay
all: $(BIN) $(PLAYER)
-$(LOCALCONFIG): config.def.h
- cp config.def.h $@
-
-$(SRC): $(LOCALCONFIG)
+$(SRC): config.h
$(BIN): $(SRC)
- $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
strip $@
install: all
diff --git a/config.def.h b/config.h
index 45f036e..45f036e 100644
--- a/config.def.h
+++ b/config.h