Skip to content
Snippets Groups Projects
Commit a6ecafce authored by Don Kjer's avatar Don Kjer
Browse files

Change install directory to include viewer version

parent aee13892
No related branches found
No related tags found
No related merge requests found
...@@ -296,7 +296,7 @@ then ...@@ -296,7 +296,7 @@ then
# upload debian package and create repository # upload debian package and create repository
begin_section "Upload Debian 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 upload_item debian $deb_file binary/octet-stream
done done
if [ -d "$build_log_dir/debian_repo" ] if [ -d "$build_log_dir/debian_repo" ]
......
...@@ -11,7 +11,9 @@ ...@@ -11,7 +11,9 @@
SRCDIR=build-linux-i686/newview/packaged SRCDIR=build-linux-i686/newview/packaged
DESTDIR=$(CURDIR)/debian/secondlife-viewer 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: configure-stamp
configure-stamp: configure-stamp:
...@@ -59,6 +61,7 @@ install: build ...@@ -59,6 +61,7 @@ install: build
install -v -m $$PERM -o root -g root "$(SRCDIR)/$$file" "$(DESTDIR)/$(INSTALLDIR)/$$file"; \ install -v -m $$PERM -o root -g root "$(SRCDIR)/$$file" "$(DESTDIR)/$(INSTALLDIR)/$$file"; \
done done
dh_link /$(INSTALLDIR)/secondlife /usr/bin/secondlife dh_link /$(INSTALLDIR)/secondlife /usr/bin/secondlife
dh_link $(BASEDIR)/SecondLife-i686-$(VIEWER_VERSION) $(BASEDIR)/SecondLife
# Build architecture-independent files here. # Build architecture-independent files here.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment