make Makefile more packaging friendly (#76)

* make Makefile more packaging friendly

* packagecore: run `strip` before installing

diff --git a/Makefile b/Makefile
index e8224d8006784430d0bab8995526f689e5d695c5..e0196c111aab9494fde593d97337c89bac0bb6a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,11 @@
 VERSION = 1.6
 
 PREFIX ?= /usr/local
-MANPREFIX = $(PREFIX)/share/man
+MANPREFIX ?= $(PREFIX)/share/man
+STRIP ?= strip
 
-CFLAGS += -O3 -Wall -Wextra -Wno-unused-parameter
+CFLAGS ?= -O3
+CFLAGS += -Wall -Wextra -Wno-unused-parameter
 LDLIBS = -lreadline
 
 ifeq ($(shell pkg-config ncursesw && echo 1),1)
@@ -23,30 +25,33 @@ all: $(BIN) $(PLAYER)
 $(SRC): nnn.h
 
 $(BIN): $(SRC)
-       $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS)
-       strip $@
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 debug: $(SRC)
-       $(CC) -DDEBUGMODE -g $(CFLAGS) -o nnn $^ $(LDFLAGS) $(LDLIBS)
+       $(CC) -DDEBUGMODE -g $(CFLAGS) $(LDFLAGS) -o $(BIN) $^ $(LDLIBS)
 
 install: all
-       mkdir -p $(DESTDIR)$(PREFIX)/bin
-       cp -f $(BIN) $(DESTDIR)$(PREFIX)/bin
-       cp -f $(PLAYER) $(DESTDIR)$(PREFIX)/bin
-       mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-       cp -f $(BIN).1 $(DESTDIR)$(MANPREFIX)/man1
+       install -m 0755 -d $(DESTDIR)$(PREFIX)/bin
+       install -m 0755 -t $(DESTDIR)$(PREFIX)/bin $(BIN) $(PLAYER)
+       install -m 0755 -d $(DESTDIR)$(MANPREFIX)/man1
+       install -m 0644 -t $(DESTDIR)$(MANPREFIX)/man1 $(BIN).1
 
 uninstall:
-       rm -f $(DESTDIR)$(PREFIX)/bin/$(BIN)
-       rm -f $(DESTDIR)$(PREFIX)/bin/$(PLAYER)
-       rm -f $(DESTDIR)$(MANPREFIX)/man1/$(BIN).1
+       $(RM) $(DESTDIR)$(PREFIX)/bin/$(BIN)
+       $(RM) $(DESTDIR)$(PREFIX)/bin/$(PLAYER)
+       $(RM) $(DESTDIR)$(MANPREFIX)/man1/$(BIN).1
+
+strip: $(BIN)
+       $(STRIP) $^
 
 dist:
        mkdir -p nnn-$(VERSION)
-       cp $(DISTFILES) nnn-$(VERSION)
+       $(CP) $(DISTFILES) nnn-$(VERSION)
        tar -cf nnn-$(VERSION).tar nnn-$(VERSION)
        gzip nnn-$(VERSION).tar
-       rm -rf nnn-$(VERSION)
+       $(RM) -r nnn-$(VERSION)
 
 clean:
-       rm -f $(BIN) nnn-$(VERSION).tar.gz
+       $(RM) -f $(BIN) nnn-$(VERSION).tar.gz
+
+.PHONY: all debug install uninstall strip dist clean

diff --git a/packagecore.yaml b/packagecore.yaml
index 7b861fb88181f1b5006a45076c82a48e600e781e..473827de9f698e67a4e5bf3388e2b702613d00f0 100644 (file)
--- a/packagecore.yaml
+++ b/packagecore.yaml
@@ -5,7 +5,7 @@ summary: The missing terminal file browser for X.
 homepage: https://github.com/jarun/nnn
 commands:
   install:
-    - make PREFIX="/usr" install DESTDIR="${BP_DESTDIR}"
+    - make PREFIX="/usr" strip install DESTDIR="${BP_DESTDIR}"
 packages:
   archlinux:
     builddeps: