diff options
| author | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-18 18:23:37 -0400 |
| commit | d4c92983920cfe3b25a22d91e12c750e591b917e (patch) | |
| tree | c0b63318b9ba0e67528337cfaa21515def1c3962 /backends/platform/webos | |
| parent | 7e2edf16b3e2bf1d2b31999979a60802514df6cb (diff) | |
| parent | cf107e24be28c7e6db65b5c7ffed120af4a7994b (diff) | |
| download | scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.gz scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.tar.bz2 scummvm-rg350-d4c92983920cfe3b25a22d91e12c750e591b917e.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/platform/webos')
| -rw-r--r-- | backends/platform/webos/main.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/webos/webos.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/webos/webos.h | 3 | ||||
| -rw-r--r-- | backends/platform/webos/webos.mk | 11 |
4 files changed, 8 insertions, 12 deletions
diff --git a/backends/platform/webos/main.cpp b/backends/platform/webos/main.cpp index eefdd30496..43c7ba18af 100644 --- a/backends/platform/webos/main.cpp +++ b/backends/platform/webos/main.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h diff --git a/backends/platform/webos/webos.cpp b/backends/platform/webos/webos.cpp index 7db17f4b9f..bfb19ed3bc 100644 --- a/backends/platform/webos/webos.cpp +++ b/backends/platform/webos/webos.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "backends/platform/webos/webos.h" diff --git a/backends/platform/webos/webos.h b/backends/platform/webos/webos.h index 1cdba703e0..850aaf9ce2 100644 --- a/backends/platform/webos/webos.h +++ b/backends/platform/webos/webos.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef PLATFORM_SDL_WEBOS_H diff --git a/backends/platform/webos/webos.mk b/backends/platform/webos/webos.mk index 2b145b00c9..37223ac56c 100644 --- a/backends/platform/webos/webos.mk +++ b/backends/platform/webos/webos.mk @@ -58,7 +58,8 @@ PATH_DIST = $(srcdir)/dists/webos PATH_MOJO = $(PATH_DIST)/mojo APP_ID = $(shell basename $(prefix)) APP_VERSION = $(shell printf "%d.%d.%02d%02d" $(VER_MAJOR) $(VER_MINOR) $(VER_PATCH) $(VER_PACKAGE)) -DESTDIR ?= portdist +DESTDIR ?= staging +PORTDISTDIR ?= portdist install: all $(QUIET)$(INSTALL) -d "$(DESTDIR)$(prefix)" @@ -87,5 +88,9 @@ endif uninstall: $(QUIET)$(RM_REC) "$(DESTDIR)$(prefix)" -package: install - $(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format "$(DESTDIR)$(prefix)" -o "$(DESTDIR)" +package: uninstall install + $(QUIET)$(RM_REC) "$(PORTDISTDIR)" + $(QUIET)$(MKDIR) "$(PORTDISTDIR)" + $(QUIET)$(WEBOS_SDK)/bin/palm-package --use-v1-format "$(DESTDIR)$(prefix)" -o "$(PORTDISTDIR)" + +.PHONY: install uninstall package |