Change install directory to include viewer version

master
Don Kjer 2012-07-06 01:53:34 +00:00
parent aee13892c8
commit a6ecafceff
2 changed files with 5 additions and 2 deletions

View File

@ -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" ]

5
debian/rules vendored
View File

@ -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.