From d51d2a6e607d068ee801e5b66e610b314fe481c2 Mon Sep 17 00:00:00 2001
From: g <g@dbf4865f-1ec6-0310-8412-f61adeb1ccb1>
Date: Wed, 4 Feb 2004 22:40:15 +0000
Subject: [PATCH] Finally solve all problems with make install and the RPM
 spec.

git-svn-id: file:///srv/svn/gliv/trunk@246 dbf4865f-1ec6-0310-8412-f61adeb1ccb1

committer: g <g@dbf4865f-1ec6-0310-8412-f61adeb1ccb1>
---
 Makefile.am  | 21 ++++++++++++---------
 Makefile.in  | 21 ++++++++++++---------
 gliv.spec.in |  3 ++-
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 459f162..d59d444 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,13 +39,16 @@ install-data-hook:
 	@echo "|                                                          |"
 	@echo "+----------------------------------------------------------+"
 	@echo
-	@if desktop-file-install --usage > /dev/null 2>&1; then               \
-	 echo "Installing the GLiv desktop file with desktop-file-install";   \
-	 mkdirhier $(datadir)/{pixmaps,applications} || true;                 \
-	 desktop-file-install --vendor=gnome                                  \
-	                      --dir=$(datadir)/applications                   \
-	                      gliv.desktop || true;                           \
-	 cp gliv.png $(datadir)/pixmaps/gliv.png || true;                     \
-	else                                                                  \
-	 echo "No desktop-file-install(1), skipping gliv.desktop";            \
+	@if desktop-file-install --usage > /dev/null 2>&1; then             \
+	 echo "Installing the GLiv desktop file with desktop-file-install"; \
+	 mkdirhier $(datadir)/pixmaps || true;                              \
+	 cp gliv.png $(datadir)/pixmaps/gliv.png || true;                   \
+	 desktop-file-install --vendor=gnome gliv.desktop || true;          \
+	 if [ -n "$$RPM_BUILD_ROOT" ]; then                                 \
+	  mkdirhier $(datadir)/applications || true;                        \
+	  cd $(datadir)/applications || true;                               \
+	  cp /usr/share/applications/gnome-gliv.desktop . || true;          \
+	 fi                                                                 \
+	else                                                                \
+	 echo "No desktop-file-install(1), skipping gliv.desktop";          \
 	fi
diff --git a/Makefile.in b/Makefile.in
index 4f0f251..e703441 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -695,15 +695,18 @@ install-data-hook:
 	@echo "|                                                          |"
 	@echo "+----------------------------------------------------------+"
 	@echo
-	@if desktop-file-install --usage > /dev/null 2>&1; then               \
-	 echo "Installing the GLiv desktop file with desktop-file-install";   \
-	 mkdirhier $(datadir)/{pixmaps,applications} || true;                 \
-	 desktop-file-install --vendor=gnome                                  \
-	                      --dir=$(datadir)/applications                   \
-	                      gliv.desktop || true;                           \
-	 cp gliv.png $(datadir)/pixmaps/gliv.png || true;                     \
-	else                                                                  \
-	 echo "No desktop-file-install(1), skipping gliv.desktop";            \
+	@if desktop-file-install --usage > /dev/null 2>&1; then             \
+	 echo "Installing the GLiv desktop file with desktop-file-install"; \
+	 mkdirhier $(datadir)/pixmaps || true;                              \
+	 cp gliv.png $(datadir)/pixmaps/gliv.png || true;                   \
+	 desktop-file-install --vendor=gnome gliv.desktop || true;          \
+	 if [ -n "$$RPM_BUILD_ROOT" ]; then                                 \
+	  mkdirhier $(datadir)/applications || true;                        \
+	  cd $(datadir)/applications || true;                               \
+	  cp /usr/share/applications/gnome-gliv.desktop . || true;          \
+	 fi                                                                 \
+	else                                                                \
+	 echo "No desktop-file-install(1), skipping gliv.desktop";          \
 	fi
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/gliv.spec.in b/gliv.spec.in
index da144a5..b6f3482 100644
--- a/gliv.spec.in
+++ b/gliv.spec.in
@@ -47,4 +47,5 @@ rm -rf
 %{prefix}/bin/%{name}
 %{_mandir}/man1/*
 %{_datadir}/locale/*/*/*
-%{_datadir}/*/*
+%{_datadir}/pixmaps/*
+/usr/share/applications/*
-- 
2.11.4.GIT