From f06076635e7c35d47bd51077ac35ef18a82f9699 Mon Sep 17 00:00:00 2001
From: "Glenn Y. Rolland" <glenux@glenux.net>
Date: Sat, 30 Jul 2011 02:50:23 +0200
Subject: [PATCH] Makefile: Fix configuration installation rules.

---
 Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 5dd43ba..c7cfdf7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
 NAME=qasim
-CONFDIR=$(DESTDIR)/etc/$(NAME)
+CONFDIR=$(DESTDIR)/etc
 BINDIR=$(DESTDIR)/usr/bin
 MANDIR=$(DESTDIR)/usr/share/man
 DOCDIR=$(DESTDIR)/usr/share/doc/$(NAME)
@@ -44,10 +44,16 @@ install:
 	## Install completion file
 	# install -D -o root -g root -m 644 $(CURDIR)/$(NAME).completion $(DESTDIR)/etc/bash_completion.d/$(NAME)
 	#
-	mkdir -p $(CONFDIR)
-	for f in `ls conf`; do \
-	  cp conf/$$f $(CONFDIR)/$$f ;  \
-	done
+	#
+	# Install configuration files
+	mkdir -p $(CONFDIR)/xdg/autostart
+	install -D -o root -g root -m 644 $(CURDIR)/conf/autostart/$(NAME).desktop \
+		$(CONFDIR)/xdg/autostart/$(NAME).desktop
+	mkdir -p $(CONFDIR)/$(NAME)
+	install -D -o root -g root -m 644 $(CURDIR)/conf/config \
+		$(CONFDIR)/$(NAME)/config
+	install -D -o root -g root -m 644 $(CURDIR)/conf/default.map \
+		$(CONFDIR)/$(NAME)/default.map
 	#
 	mkdir -p $(DOCDIR)/examples
 	for f in `ls examples`; do \