[Gnash-commit] /srv/bzr/gnash/trunk r11982: pick a better default directory for the build.

[Rob Savoye]

------------------------------------------------------------
revno: 11982
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-02-26 17:57:06 -0700
message:
  pick a better default directory for the build.
modified:
  packaging/deb.am

=== modified file 'packaging/deb.am'
--- a/packaging/deb.am  2010-02-27 00:42:41 +0000
+++ b/packaging/deb.am  2010-02-27 00:57:06 +0000
@@ -46,7 +46,7 @@
 # Look at the build options to calculate the new build name. This is
 # used for the the snapshot source directory name.
 BUILD_DIR := $(shell \
-       snapshot_dir=_build; \
+       snapshot_dir=$(SNAPSHOT_DIR); \
        if test $(OGL) -eq 1 -o $(FFMPEG) -eq 1 -o $(VAAPI) -eq 1; then \
          if test $(OGL) -eq 1 -a $(FFMPEG) -eq 1; then \
            snapshot_dir=$(subst bzr,bzr.ogl.ffmpeg,$(SNAPSHOT_DIR)); \
@@ -222,6 +222,6 @@
        (cd $(BUILD_DIR); dpkg-buildpackage -rfakeroot -j4)
 
 # these files are created when building packages
-CLEANFILES += *trunk*.deb *trunk*.gz *trunk*.bz2 *trunk*.changes
+CLEANFILES += *trunk*.deb *trunk*.gz *trunk*.bz2 *trunk*.changes deb-copy-stamp
 
 .PHONY : deb debian snapshot-deb setup-deb deb-edit-control deb-edit-changelog 
deb-copy-files deb-rename-build deb-edit-configure deb-edit-install 
deb-edit-utilities deb-edit-python deb-edit-mozilla