nsnake/df8e8e39d9de33be6ff725a53ab74a69129ce57c.patch
Christopher Meng f4980fe503 Update to 2.0.5
2014-07-10 15:02:23 +08:00

96 lines
2.7 KiB
Diff

From df8e8e39d9de33be6ff725a53ab74a69129ce57c Mon Sep 17 00:00:00 2001
From: Christopher Meng <cickumqt@gmail.com>
Date: Thu, 10 Jul 2014 14:37:50 +0800
Subject: [PATCH] Don't muddle up cflags and ldflags
CFLAGS != LDFLAGS, using PLATFORM as global is bad.
Also for that bin file, well, /usr/bin is pretty common now, I don't know why some distros still prefer /usr/games.
DESTDIR != PREFIX, please do NOT put them together
---
Makefile | 33 +++++++++++++++------------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index e8b5924..6136c5a 100644
--- a/Makefile
+++ b/Makefile
@@ -44,27 +44,24 @@ FILES = BUGS ChangeLog COPYING Doxyfile \
INSTALL.md Makefile README.md TODO
# Install dirs
-DESTDIR =
-PREFIX = $(DESTDIR)/usr
-
+PREFIX = /usr
EXEC_PREFIX = $(PREFIX)
DATAROOTDIR = $(PREFIX)/share
MANROOT = $(DATAROOTDIR)/man
-
-MANNUMBER = 6
-
-BINDIR = $(EXEC_PREFIX)/games
+BINDIR = $(EXEC_PREFIX)/bin
MANDIR = $(MANROOT)/man$(MANNUMBER)
+MANNUMBER = 6
MANFILE = $(PACKAGE).$(MANNUMBER)
MANPAGE = doc/man/$(MANFILE)
# Build info
+CFLAGS_PLATFORM =
+LDFLAGS_PLATFORM =
EXE = $(PACKAGE)
CDEBUG = -O2
-PLATFORM =
-CXXFLAGS = $(CDEBUG) -Wall -Wextra $(PLATFORM)
-LDFLAGS = -lncurses -liniparser $(PLATFORM)
+CXXFLAGS = $(CDEBUG) -Wall -Wextra $(CFLAGS_PLATFORM)
+LDFLAGS = -lncurses -liniparser $(LDFLAGS_PLATFORM)
INCLUDESDIR = -I"src/" -I"deps/"
LIBSDIR =
@@ -80,7 +77,7 @@ DEFINES = -DVERSION=\""$(VERSION)"\" \
# commander stuff
COMMANDERDIR = deps/commander
-COMMANDER_CFLAGS = -O2 -Wall -Wextra $(PLATFORM)
+COMMANDER_CFLAGS = -O2 -Wall -Wextra $(CFLAGS_PLATFORM)
COMMANDER_OBJS = $(COMMANDERDIR)/commander.o
# Distribution tarball
@@ -113,22 +110,22 @@ all: dirs $(EXE)
install: all
# Installing...
- $(MUTE)install -d -m 755 $(BINDIR)
- $(MUTE)install -m 755 bin/$(EXE) $(BINDIR)
+ $(MUTE)install -pdm755 $(DESTDIR)$(BINDIR)
+ $(MUTE)install -pm755 bin/$(EXE) $(DESTDIR)$(BINDIR)
-$(MUTE)cat $(MANPAGE) | sed -e "s|DATE|$(DATE)|g" -e "s|VERSION|$(VERSION)|g" >$(MANFILE)
- $(MUTE)install -d $(MANDIR)
- $(MUTE)install $(MANFILE) $(MANDIR)
+ $(MUTE)install -pdm755 $(DESTDIR)$(MANDIR)
+ $(MUTE)install -pm644 $(MANFILE) $(DESTDIR)$(MANDIR)
$(MUTE)rm -f $(MANFILE)
# $(PACKAGE) successfuly installed!
uninstall:
# Uninstalling...
- $(MUTE)rm -f $(BINDIR)/$(EXE)
- $(MUTE)rm -f $(MANDIR)/$(MANFILE)
+ $(MUTE)rm -f $(DESTDIR)$(BINDIR)/$(EXE)
+ $(MUTE)rm -f $(DESTDIR)$(MANDIR)/$(MANFILE)
purge: uninstall
# Purging configuration files...
- $(MUTE)rm -f $(MANDIR)/$(MANFILE)
+ $(MUTE)rm -f $(DESTDIR)$(MANDIR)/$(MANFILE)
$(EXE): $(OBJECTS) $(COMMANDER_OBJS)
# Linking...
--
1.9.3