From 0c0a8fabf1884e0a2be89abdb5f5a2534790c40f Mon Sep 17 00:00:00 2001 From: NicoHood Date: Tue, 25 Oct 2016 19:43:53 +0200 Subject: [PATCH] Fixed makefile installation method --- Makefile | 23 ++++++++++++++--------- create_ap | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 862f446..9de41fb 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,21 @@ +PREFIX=/usr +MANDIR=$(PREFIX)/share/man +BINDIR=$(PREFIX)/bin + all: @echo "Run 'make install' for installation." @echo "Run 'make uninstall' for uninstallation." install: - cp create_ap /usr/bin/create_ap - cp create_ap.conf /etc/create_ap.conf - [ ! -d /lib/systemd/system ] || cp create_ap.service /lib/systemd/system - mkdir -p /usr/share/bash-completion/completions - cp bash_completion /usr/share/bash-completion/completions/create_ap + install -Dm755 create_ap $(DESTDIR)$(BINDIR)/create_ap + install -Dm644 create_ap.conf $(DESTDIR)/etc/create_ap.conf + [ ! -d /lib/systemd/system ] || install -Dm644 create_ap.service $(DESTDIR)/lib/systemd/system/create_ap.service + install -Dm644 bash_completion $(DESTDIR)$(PREFIX)/share/bash-completion/completions/create_ap + install -Dm644 README.md $(DESTDIR)$(PREFIX)/share/doc/${pkgname}/README.md uninstall: - rm /usr/bin/create_ap - rm /etc/create_ap.conf - [ ! -f /lib/systemd/system/create_ap.service ] || rm /lib/systemd/system/create_ap.service - rm /usr/share/bash-completion/completions/create_ap + rm -f $(DESTDIR)$(BINDIR)/create_ap + rm -f $(DESTDIR)/etc/create_ap.conf + [ ! -f /lib/systemd/system/create_ap.service ] || rm -f $(DESTDIR)/lib/systemd/system/create_ap.service + rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/create_ap + rm -f $(DESTDIR)$(PREFIX)/share/doc/${pkgname}/README.md diff --git a/create_ap b/create_ap index 97b97b6..a19d8e3 100755 --- a/create_ap +++ b/create_ap @@ -14,7 +14,7 @@ # dnsmasq # iptables -VERSION=0.4 +VERSION=0.4.1 PROGNAME="$(basename $0)" # make sure that all command outputs are in english