Changeset 41163 in vbox

Timestamp:

May 4, 2012 12:52:19 PM (13 years ago)

Author:

vboxsync

Message:

rpm: fixed wrong rpm docs path

File:

• trunk/src/VBox/Installer/linux/rpm/rules (modified) (2 diffs)

trunk/src/VBox/Installer/linux/rpm/rules

@@ -97 +97 @@
   $(error failed to detect the .spec file (rpmrel=$(rpmrel)))
  endif
-endif
-
-ifneq ($(wildcard $(verfile)),)
-include $(verfile)
+
+ # contrary to debian we need the verfile earlier to get the correct rpmname into the bld_flags
+ include $(verfile)
+$(verfile): rpm/configure-stamp
+        . rpm/env.sh && kmk -C $(vboxroot) $(verfile) $(bld_flags)
+
+endif
+
 ver      := $(VBOX_VERSION_STRING)
 rpmver   :=$(ver)$(if $(NOSUBVER),,$(if $(svn_revision),_$(svn_revision),)$(VERSUFFIX)$(if $(HEADLESS),_headless,)$(if $(DEBUG),_dbg,))$(if $(BLEEDING_EDGE),_$(BLEEDING_EDGE),)
 archdir  := $(current)/rpm/VirtualBox-$(ver)
 rpmname  := $(verpkg)-$(rpmver)_$(rpmrel)
-endif
 
 # Fedora13/14 is bleeding edge, the other jails have outdated kernel headers
@@ -167 +170 @@
         touch rpm/configure-stamp
 
-rpm/build-stamp $(verfile): rpm/configure-stamp
+rpm/build-stamp: rpm/configure-stamp
         . rpm/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all
         $(if $(NODOCS),cp $(vboxroot)/prebuild/UserManual*.pdf $(builddir)/bin,)