autotag: make git complatible (however needs to be in package dir)

[packages/rpm-build-macros.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 545d011b96da1ff58782acf6e5f0e8ba9be1e55d..9bcf7a7d3b57f768f0311ba589eb7b141a799d0c 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -521,7 +521,9 @@ CXXFLAGS="%{rpmcxxflags}" \
                                        l=${l#/usr/share/man/}; \
                                        l=${l#/usr/X11R6/man/}; \
                                else \
-                                       l=$m; \
+                                       l=${a#$RPM_BUILD_ROOT$i/}; \
+                                       l=${l%/*}; \
+                                       l="$l/$m"; \
                                fi; \
                                rm -f $a; \
                                echo ".so $l" > $a; \
@@ -1649,7 +1651,7 @@ compile() {                                                                                                                       \
                                                                                                                                        \
        [ -r "%{_kernelsrcdir}/.config" ] || exit 1                                             \
        rm -rf o                                                                                                                \
-       install -d o/include/linux o/include/generated o/arch/powerpc/lib       \
+       install -d o/include/linux o/include/generated o/arch/x86/include o/arch/powerpc/lib    \
        ln -sf %{_kernelsrcdir}/.config o/.config                                               \
        ln -sf %{_kernelsrcdir}/Module.symvers o/Module.symvers                 \
        if [ -f %{_kernelsrcdir}/include/generated/autoconf.h ]; then   \
@@ -1657,6 +1659,9 @@ compile() {                                                                                                                       \
                ln -s ../generated/autoconf.h o/include/linux/autoconf.h        \
        else                                                                                                                    \
                ln -sf %{_kernelsrcdir}/include/linux/autoconf.h o/include/linux/autoconf.h \
+       fi                                                                                                                              \
+       if [ -d %{_kernelsrcdir}/arch/x86/include/generated ]; then             \
+               ln -s %{_kernelsrcdir}/arch/x86/include/generated o/arch/x86/include    \
        fi                                                                                                                              \
                                                                                                                                        \
        set +x                                                                                                                  \