From a6ecafceff18497deba2e0d308f97b044027f7f0 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 6 Jul 2012 01:53:34 +0000
Subject: [PATCH] Change install directory to include viewer version
---
build.sh | 2 +-
debian/rules | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.sh b/build.sh
index ac7fdc4f75..47b3ff545e 100755
--- a/build.sh
+++ b/build.sh
@@ -296,7 +296,7 @@ then
# upload debian package and create repository
begin_section "Upload Debian Repository"
- for deb_file in ./*.deb; do
+ for deb_file in ../*.deb; do
upload_item debian $deb_file binary/octet-stream
done
if [ -d "$build_log_dir/debian_repo" ]
diff --git a/debian/rules b/debian/rules
index eedeeef879..e4106ff75c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,9 @@
SRCDIR=build-linux-i686/newview/packaged
DESTDIR=$(CURDIR)/debian/secondlife-viewer
-INSTALLDIR=opt/linden/viewer
+BASEDIR=opt/linden/viewer
+VIEWER_VERSION:=$(shell dpkg-parsechangelog | grep ^Version | sed 's/^Version: //')
+INSTALLDIR:=$(BASEDIR)/SecondLife-i686-$(VIEWER_VERSION)
configure: configure-stamp
configure-stamp:
@@ -59,6 +61,7 @@ install: build
install -v -m $$PERM -o root -g root "$(SRCDIR)/$$file" "$(DESTDIR)/$(INSTALLDIR)/$$file"; \
done
dh_link /$(INSTALLDIR)/secondlife /usr/bin/secondlife
+ dh_link $(BASEDIR)/SecondLife-i686-$(VIEWER_VERSION) $(BASEDIR)/SecondLife
# Build architecture-independent files here.
--
GitLab