From e8d6b2c24079ef2f98887d9dc95eee1da1fb831c Mon Sep 17 00:00:00 2001
From: telans <telans@protonmail.com>
Date: Thu, 25 Jun 2020 20:51:55 +1200
Subject: [PATCH] add "make install"

---
 .gitignore       | 13 +++++++------
 Makefile         | 30 ++++++++++++++++++++++--------
 package/PKGBUILD | 13 ++-----------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 01b989e..ffc75f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,13 @@ vgcore.*
 massif.*
 /bin/SamRewritten
 /bin/samrewritten
+build/
 /glade/*.glade~
 /glade/*.glade#
-obj/*
-package/AppDir/*
-package/pkg/*
-package/src/*
-package/SamRewritten/*
+package/AppDir/
+package/pkg/
+package/src/
+package/SamRewritten/
 package/SamRewritten*.AppImage
-package/samrewritten*.tar.*
\ No newline at end of file
+package/samrewritten*.tar.*
+obj/
diff --git a/Makefile b/Makefile
index b7c176d..ebd3435 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,14 @@
 CXX=g++ -std=c++17
-RM=rm -f
-RMDIR=rm -rf
+OBJDIR=obj
+LIBDIR?=lib
+PREFIX=/usr
 HFILES:=$(shell find src/ -type f -iname *.h -print)
 CXXFILES:=$(shell find src/ -type f -iname *.cpp -print)
-GTKFLAGS=$(shell pkg-config gtkmm-3.0 --cflags --libs)
-CXXFLAGS=$(GTKFLAGS) -Wall -lsteam_api -lcurl -lyajl -ldl
-LDFLAGS=-L${CURDIR}/bin
-OBJDIR=obj
+GTKFLAGS:=$(shell pkg-config gtkmm-3.0 --cflags --libs)
+CXXFLAGS+=$(GTKFLAGS) -Wall -lsteam_api -lcurl -lyajl -ldl
+LDFLAGS+=-L${CURDIR}/bin
 OBJS=$(addprefix ${OBJDIR}/,$(subst .cpp,.o,${CXXFILES}))
 
-all: CXXFLAGS += -O3
 all: ${CURDIR}/bin/samrewritten
 	@echo -e "==== Use '\033[1mmake dev\033[0m' to keep debug symbols"
 	@echo -e "==== Use '\033[1mmake clean\033[0m' to remove object files"
@@ -18,8 +17,23 @@ all: ${CURDIR}/bin/samrewritten
 dev: CXXFLAGS += -g -DDEBUG_CERR
 dev: ${CURDIR}/bin/samrewritten
 
+.PHONY: clean
 clean:
-	${RMDIR} ${OBJDIR}
+	rm -rf ${OBJDIR}
+
+.PHONY: install
+install: bin/launch.sh bin/samrewritten bin/libsteam_api.so
+	mkdir -p ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/{bin,glade,assets}
+	mkdir -p ${DESTDIR}${PREFIX}/share/icons/hicolor/{64x64,256x256}/apps
+	mkdir -p ${DESTDIR}${PREFIX}/share/applications
+	mkdir -p ${DESTDIR}${PREFIX}/bin
+	cp $^ ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/bin/
+	ln -s ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/bin/launch.sh ${DESTDIR}${PREFIX}/bin/samrewritten
+	cp glade/main_window.glade ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/glade/main_window.glade
+	cp assets/icon_64.png ${DESTDIR}${PREFIX}/share/icons/hicolor/64x64/apps/samrewritten.png
+	cp assets/icon_256.png ${DESTDIR}${PREFIX}/share/icons/hicolor/256x256/apps/samrewritten.png
+	cp assets/icon_256.png ${DESTDIR}${PREFIX}/${LIBDIR}/SamRewritten/assets/
+	cp package/samrewritten.desktop ${DESTDIR}${PREFIX}/share/applications/
 
 ${CURDIR}/bin/samrewritten: $(OBJS)
 	${CXX} -o ${CURDIR}/bin/samrewritten $(OBJS) ${LDFLAGS} ${CXXFLAGS}
diff --git a/package/PKGBUILD b/package/PKGBUILD
index 080de8e..d741060 100644
--- a/package/PKGBUILD
+++ b/package/PKGBUILD
@@ -24,18 +24,9 @@ pkgver() {
 
 build() {
     cd ${_pkgname}
-    make
+    make DESTDIR=${pkgdir} install
 }
 
 package() {
-    install -dm755 "${pkgdir}/usr/lib/"
-    # Only copy required files. (Except for Glade files, as more may be added in the future.)
-    cp -r --parents ${_pkgname}/{LICENSE,README.MD,bin/{launch.sh,libsteam_api.so,samrewritten},glade/*.glade,assets/icon_256.png} ${pkgdir}/usr/lib/
-    install -Dm644 ${_pkgname}/assets/icon_256.png ${pkgdir}/usr/share/icons/hicolor/256x256/apps/samrewritten.png
-    install -Dm644 ${_pkgname}/assets/icon_64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/samrewritten.png
-    # Executable
-    install -dm755 ${pkgdir}/usr/bin
-    ln -s /usr/lib/${_pkgname}/bin/launch.sh ${pkgdir}/usr/bin/samrewritten
-    # Desktop Entry
-    install -Dm644 ${_pkgname}/package/samrewritten.desktop ${pkgdir}/usr/share/applications/samrewritten.desktop
+    cd ${_pkgname}
 }
\ No newline at end of file