From 40ae90920a04f9797df986d1aea96d4b3ec2789a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 16 Oct 2012 23:55:35 -0700 Subject: [PATCH] Fix typo and make variable name more logical [the macos/macosx typo was also found and a patch submitted by Henrik Brautaset Aronsen ] Signed-off-by: Dirk Hohndel --- Makefile | 4 ++-- packaging/windows/mingw-make.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1fcb9e310..1f907892c 100644 --- a/Makefile +++ b/Makefile @@ -176,13 +176,13 @@ create-macosx-bundle: $(NAME) $(INSTALL) -d -m 755 $(MACOSXSTAGING)/Contents/Resources/$$LOC; \ $(INSTALL) $$LOC/subsurface.mo $(MACOSXSTAGING)/Contents/Resources/$$LOC/subsurface.mo; \ done - $(GTK_MAC_BUNDLER) packaging/macos/subsurface.bundle + $(GTK_MAC_BUNDLER) packaging/macosx/subsurface.bundle install-cross-windows: $(NAME) $(INSTALL) -d -m 755 $(WINDOWSSTAGING)/share/locale for MSG in $(WINMSGDIRS); do\ $(INSTALL) -d -m 755 $(WINDOWSSTAGING)/$$MSG;\ - $(INSTALL) $(CROSS_LOCALE_PATH)/$$MSG/* $(WINDOWSSTAGING)/$$MSG;\ + $(INSTALL) $(CROSS_PATH)/$$MSG/* $(WINDOWSSTAGING)/$$MSG;\ done for MSG in $(MSGOBJS); do\ $(INSTALL) -d -m 755 $$(dirname $(WINDOWSSTAGING)/$$MSG);\ diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index 13a4cf5a9..ccd418c6f 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -10,6 +10,6 @@ export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH make CC=i686-w64-mingw32-gcc \ PKGCONFIG=i686-w64-mingw32-pkg-config \ PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \ - CROSS_LOCALE_PATH=/usr/i686-w64-mingw32/sys-root/mingw/share/ \ + CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw/ \ XSLTCONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xslt-config \ XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe install-cross-windows