[gnustep-make/f20] Change macros in macros.gnustep

[Jochen Schmitt]

commit 11b871b622ed060fde861f6774a31676f7b606d6
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Aug 21 22:25:16 2013 +0200

    Change macros in macros.gnustep

 gnustep-make.spec |    5 ++++-
 macros.gnustep    |   13 ++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/gnustep-make.spec b/gnustep-make.spec
index 3d98070..7781cab 100644
--- a/gnustep-make.spec
+++ b/gnustep-make.spec
@@ -2,7 +2,7 @@
 
 Name:           gnustep-make
 Version:        2.6.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNUstep makefile package
 
 Group:          Development/Tools
@@ -122,6 +122,9 @@ fi
 
 
 %changelog
+* Wed Aug 21 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.5-3
+- Change macros in macros.gnustep
+
 * Tue Aug  6 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.5-2
 - Remove empty versioned docdir (#993796(
 
diff --git a/macros.gnustep b/macros.gnustep
index d491454..b4447ff 100644
--- a/macros.gnustep
+++ b/macros.gnustep
@@ -10,16 +10,15 @@
 %gnustep_additional %{gnustep_libdir}/Makefiles/Additional
 %gnustep_libraries %{gnustep_libdir}/Libraries
 
-%gnustep_datadir %{_datadir}/GNUstep
-%gnustep_docdir %{gnustep_datadir}/Documentation
+%gnustep_docdir %{gnustep_libdir}/Documentation
 %gnustep_devdocdic %{gnustep_docdir}/Development
 %gnustep_userdocdir %{gnustep_docdir}/User
 %gnustep_dtddir %{gnustep_libdir}/DTDs
-%gnustep_fontdir %{gnustep_datadir}/Fonts
-%gnustep_imagedir %{gnustep_datadir}/Images
-%gnustep_kbdir %{gnustep_datadir}/KeyBindings
-%gnustep_psdir %{gnustep_datadir}/PostScript
-%gnustep_sounddir %{gnustep_datadir}/Sounds
+%gnustep_fontdir %{gnustep_libdir}/Fonts
+%gnustep_imagedir %{gnustep_libdir}/Images
+%gnustep_kbdir %{gnustep_libdir}/KeyBindings
+%gnustep_psdir %{gnustep_libdir}/PostScript
+%gnustep_sounddir %{gnustep_libdir}/Sounds
 
 %gnustep_configure\
 %configure --with-installation-domain=SYSTEM