[gnustep-make] Remove GNUSTEP_MAKFILES assignment from %gnustep_make macro

[Jochen Schmitt]

commit fb6461dda8cc4e514a47e78a387abd38fd8b4231
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Wed Apr 3 10:47:06 2013 +0200

    Remove GNUSTEP_MAKFILES assignment from %gnustep_make macro

 gnustep-make.spec |    5 ++++-
 macros.gnustep    |   41 ++++++++++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/gnustep-make.spec b/gnustep-make.spec
index d7b49f4..87b9ff0 100644
--- a/gnustep-make.spec
+++ b/gnustep-make.spec
@@ -2,7 +2,7 @@
 
 Name:           gnustep-make
 Version:        2.6.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        GNUstep makefile package
 
 Group:          Development/Tools
@@ -138,6 +138,9 @@ fi
 
 
 %changelog
+* Mon Apr  1 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.4-7
+- Remove GNUSTEP_MAKFILES assignment from %%gnustep_make macro
+
 * Sun Mar 31 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.6.4-6
 - Fix issue with continuations in rpm macros
 
diff --git a/macros.gnustep b/macros.gnustep
index c4c2ea7..555769c 100644
--- a/macros.gnustep
+++ b/macros.gnustep
@@ -11,28 +11,39 @@
 %gnustep_devdocdic %{gnustep_docdir}Development/
 %gnustep_fontdir %{gnustep_libdir}Fonts/
 %gnustep_imagedir %{gnustep_libdir}Images/
-%gnustep_psdir %{gnustep_libdir}Postscript/
-%gnustep_sonddir %{gnustep_libdir}Sounds/
+%gnustep_psdir %{gnustep_libdir}PostScript/
+%gnustep_sounddir %{gnustep_libdir}Sounds/
 %gnustep_srvdir %{gnustep_libdir}Services/
 
 %gnustep_makefiles %{gnustep_libdir}Makefiles/
 %gnustep_additional %{gnustep_libdir}Makefiles/Additional
 %gnustep_libraries %{gnustep_libdir}/Libraries/
 
-%gnustep_configure %configure --with-installation-domain=SYSTEM
+%gnustep_configure\
+%configure --with-installation-domain=SYSTEM
 
-%gnustep_make make %{?_smp_mflags} messages=yes \\\
-GNUSTEP_MAKEFILES=%{gnustep_makefiles}
+%gnustep_make(n) make %{?_smp_mflags} \\\
+%if "X%{-n:Y}" == "X" \
+    GNUSTEP_MAKEFILES=%{gnustep_makefiles} \\\
+%endif\
+    messages=yes
 
-%gnustep_makedoc make -C Documentation %{?_smp_mflags} messages=yes \\\
-GNUSTEP_MAKEFILES=%{gnustep_makefiles} 
+%gnustep_makedoc\
+make -C Documentation %{?_smp_mflags} messages=yes \\\
+    GNUSTEP_MAKEFILES=%{gnustep_makefiles} 
 
-%gnustep_install make install messages=yes \\\
-DESTDIR=%{buildroot}\\\
-GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \\\
-GNUSTEP_MAKEFILES=%{gnustep_makefiles} 
+%gnustep_install(n)\
+make install messages=yes \\\
+    DESTDIR=%{buildroot} \\\
+%if "X%{-n:Y}" == "X" \
+    GNUSTEP_MAKEFILES=%{gnustep_makefiles} \\\
+%endif \
+    GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
 
-%gnustep_installdoc make -C Documentation install messages=yes \\\
-DESTDIR=%{buildroot} \\\
-GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \\\
-GNUSTEP_MAKEFILES=%{gnustep_makefiles} 
+%gnustep_install_without_gnustep_makefiles() %gnustep_install -n
+
+%gnustep_installdoc\
+make -C Documentation install messages=yes \\\
+    DESTDIR=%{buildroot} \\\
+    GNUSTEP_INSTALLATION_DOMAIN=SYSTEM \\\
+    GNUSTEP_MAKEFILES=%{gnustep_makefiles}