- support for configuredir in %%configure (but you don't need to use it as in %%confi...

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index f95fe03b0e9755352cecb34b31a412c4219a8814..4ff4b71d6290940d417e8dbfcd0ce50c6d4fcaba 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -84,7 +84,8 @@
 }
 
 #----------------------------------------------------------------
-%configure {./configure \
+%configure { \
+       %{?configuredir:%{configuredir}}%{!?configuredir:.}/configure \
        LDFLAGS="${LDFLAGS:-%rpmldflags}" \
        CFLAGS="${CFLAGS:-%rpmcflags}" \
        CXXFLAGS="${CXXFLAGS:-%rpmcflags}" \
@@ -118,7 +119,10 @@
 %_pkgconfigdir /usr/lib/pkgconfig
 
 # Location of top applink dir
-%_applnkdir    /usr/share/applnk
+%_applnkdir    /usr/X11R6/share/applnk
+
+# Location of desktop files
+%_desktopdir   /usr/share/applications
 
 # Location pixmaps for applnk/desktop files
 %_pixmapsdir   /usr/share/pixmaps