From 5855582827006d711ded96f2de53f8edea8b3c4a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 2 Mar 2019 15:56:28 +0100
Subject: Merging upstream version 20190301.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Makefile | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index b5a3a47..0e7140b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
-# Makefile
-
-# apache-icons - Alternative icons for Apache autoindex
-# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +17,9 @@
 
 SHELL := sh -e
 
-SOFTWARE = apache-icons
+PROJECT = open-infrastructure
+SOFTWARE = service-tools
+PROGRAM = apache-icons
 
 all: build
 
@@ -47,18 +48,16 @@ build: share/man/*.txt
 	done
 
 install: build
-	mkdir -p $(DESTDIR)/usr/share/doc/$(SOFTWARE)
-	cp -a CHANGELOG.txt LICENSE.txt README.txt $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+	mkdir -p $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+	cp -r VERSION.txt $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+	cp -r build/* $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
 
-	mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE)
-	cp -a build/* $(DESTDIR)/usr/share/$(SOFTWARE)
-
-	for DIRECTORY in $(DESTDIR)/usr/share/$(SOFTWARE)/*-png; \
+	for DIRECTORY in $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/*-png; \
 	do \
 		cp -a share/common/*.png $${DIRECTORY}; \
 	done
 
-	for DIRECTORY in $(DESTDIR)/usr/share/$(SOFTWARE)/*-svg; \
+	for DIRECTORY in $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)/*-svg; \
 	do \
 		cp -a share/common/*.svg $${DIRECTORY}; \
 	done
@@ -78,6 +77,9 @@ install: build
 		fi; \
 	done
 
+	mkdir -p $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+	cp -r CHANGELOG.txt LICENSE.txt README.txt $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+
 uninstall:
 	for SECTION in $$(seq 1 8); \
 	do \
@@ -100,10 +102,10 @@ uninstall:
 	done
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/etc/apache2/mods-available || true
 
-	rm -rf $(DESTDIR)/usr/share/$(SOFTWARE)/*
-	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/$(SOFTWARE) || true
+	rm -rf $(DESTDIR)/usr/share/$(PROJECT)/$(PROGRAM)
+	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/$(PROJECT) || true
 
-	rm -rf $(DESTDIR)/usr/share/doc/$(SOFTWARE)/*
+	rm -rf $(DESTDIR)/usr/share/doc/$(SOFTWARE)
 	rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/doc/$(SOFTWARE) || true
 
 clean:
-- 
cgit v1.2.3