From 0f69886f77696c34c3093b981950dc194e4ecd18 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 11 Aug 2022 10:44:43 -0400 Subject: Converted some directory variables to lower case to match libbible --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 9c9eb08..30aa5f5 100644 --- a/Makefile +++ b/Makefile @@ -5,9 +5,9 @@ SOURCES=$(wildcard src/*.cc) OBJECTS=$(SOURCES:.cc=.o) DEPS = $(OBJECTS:.o=.d) EXECUTABLE=biblereader -PREFIX ?= /usr -EXEC_PREFIX ?= $(PREFIX) -BINDIR ?= $(EXEC_PREFIX)/bin +prefix ?= /usr +exec_prefix ?= $(prefix) +bindir ?= $(exec_prefix)/bin $(EXECUTABLE): $(OBJECTS) $(CXX) $(OBJECTS) -o $@ $(LDFLAGS) @@ -15,14 +15,14 @@ $(EXECUTABLE): $(OBJECTS) -include $(DEPS) install: $(EXECUTABLE) - install -d $(DESTDIR)$(BINDIR) - install -m 755 $(EXECUTABLE) $(DESTDIR)$(BINDIR) - install -d $(DESTDIR)$(PREFIX)/share/applications/ - install -m 644 files/biblereader.desktop $(DESTDIR)$(PREFIX)/share/applications/ - install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/ - install -m 644 files/biblereader_128.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/biblereader.png - install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/ - install -m 644 files/biblereader_64.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/64x64/apps/biblereader.png + install -d $(DESTDIR)$(bindir) + install -m 755 $(EXECUTABLE) $(DESTDIR)$(bindir) + install -d $(DESTDIR)$(prefix)/share/applications/ + install -m 644 files/biblereader.desktop $(DESTDIR)$(prefix)/share/applications/ + install -d $(DESTDIR)$(prefix)/share/icons/hicolor/128x128/apps/ + install -m 644 files/biblereader_128.png $(DESTDIR)$(prefix)/share/icons/hicolor/128x128/apps/biblereader.png + install -d $(DESTDIR)$(prefix)/share/icons/hicolor/64x64/apps/ + install -m 644 files/biblereader_64.png $(DESTDIR)$(prefix)/share/icons/hicolor/64x64/apps/biblereader.png .PHONY: clean clean: -- cgit v1.2.3