Changeset 44993 in vbox for trunk/src/VBox/Installer/linux
- Timestamp:
- Mar 11, 2013 4:14:29 PM (12 years ago)
- svn:sync-xref-src-repo-rev:
- 84216
- Location:
- trunk/src/VBox/Installer/linux
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/linux/debian/rules
r44969 r44993 53 53 ose := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1)) 54 54 -include $(vboxroot)/SVN_REVISION 55 svnrev :=$(if $(svn_revision),$(svn_revision), 0)55 svnrev :=$(if $(svn_revision),$(svn_revision),) 56 56 57 57 NOMODS ?= $(ose) … … 116 116 $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \ 117 117 VBOX_PACKAGE_DIST=$(debdist) \ 118 VBOX_SVN_REV=$(svnrev) \118 $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \ 119 119 $(if $(NODOCS),VBOX_WITH_DOCS= ,) \ 120 120 $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \ … … 141 141 . debian/env.sh && kmk -C $(vboxroot) $(bld_flags) \ 142 142 VBOX_NO_LINUX_RUN_INSTALLER=1 \ 143 VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86 -r$(svnrev).tar.bz2 \144 VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64 -r$(svnrev).tar.bz2 \143 VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \ 144 VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2 \ 145 145 VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \ 146 146 VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \ -
trunk/src/VBox/Installer/linux/rpm/rules
r44675 r44993 63 63 ose := $(if $(OSE),1,$(if $(wildcard $(vboxroot)/src/VBox/RDP/server),,1)) 64 64 -include $(vboxroot)/SVN_REVISION 65 svnrev :=$(if $(svn_revision),$(svn_revision), 0)65 svnrev :=$(if $(svn_revision),$(svn_revision),) 66 66 67 67 NOMODS ?= $(ose) … … 159 159 $(if $(ose),,VBOX_WITH_DOCS_CHM=1) \ 160 160 VBOX_PACKAGE_DIST=$(rpmdist) \ 161 VBOX_SVN_REV=$(svnrev) \161 $(if $(svnrev),VBOX_SVN_REV=$(svnrev),) \ 162 162 $(if $(NODOCS),VBOX_WITH_DOCS= ,) \ 163 163 $(if $(VERBOSE),--print-directory KBUILD_VERBOSE=2,--no-print-directory) \ … … 180 180 . rpm/env.sh && kmk -C $(vboxroot) $(bld_flags) \ 181 181 VBOX_NO_LINUX_RUN_INSTALLER=1 \ 182 VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86 -r$(svnrev).tar.bz2 \183 VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64 -r$(svnrev).tar.bz2 \182 VBOX_LNX_ADD_ARCHIVE.x86=$(builddir)/bin/additions/VBoxGuestAdditions-x86.tar.bz2 \ 183 VBOX_LNX_ADD_ARCHIVE.amd64=$(builddir)/bin/additions/VBoxGuestAdditions-amd64.tar.bz2 \ 184 184 VBOX_PATH_ADDITIONS.linux.x86=$(builddir)/bin/additions \ 185 185 VBOX_PATH_ADDITIONS.linux.amd64=$(builddir)/bin/additions \
Note:
See TracChangeset
for help on using the changeset viewer.