Fix build with latest diablo

2 files changed, 14 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 5fa50e8..272121a 100644
--- a/Makefile
+++ b/Makefile
@@ -23,9 +23,14 @@ MAEMO_FLAGS = -DHILDON -DMAEMO${MAEMO_VERSION}
 
 ifeq ($(HILDON_VERSION_MAJOR), 1)
 	MAEMO_FLAGS += -DHILDON1
-    MAEMO_VERSION = 4
+	MAEMO_VERSION = 4
 endif
 
+ifeq ($(HILDON_VERSION_MAJOR), 2)
+        MAEMO_FLAGS += -DHILDON1
+	MAEMO_VERSION = 4
+endif
+	    
 all: nethack-${NETHACK_VERSION}/src/nethack
 
 nethack-${NETHACK_VERSION_SHORT}-src.tgz:
diff --git a/dist.sh b/dist.sh
index 4121b0a..7d4f688 100755
--- a/dist.sh
+++ b/dist.sh
@@ -1,10 +1,10 @@
 #!/scratchbox/tools/bin/bash
 
-DBUS_VERSION_MAJOR=$(pkg-config dbus-1 --modversion | awk '{split($$1,t,/\./) ; print t[1]}')
-DBUS_VERSION_MINOR=$(pkg-config dbus-1 --modversion | awk '{split($$1,t,/\./) ; print t[2]}')
+DBUS_VERSION_MAJOR=$(pkg-config dbus-1 --modversion | awk '{split($0,t,/\./) ; print t[1]}')
+DBUS_VERSION_MINOR=$(pkg-config dbus-1 --modversion | awk '{split($0,t,/\./) ; print t[2]}')
 
-HILDON_VERSION_MAJOR=$(pkg-config hildon-1 --modversion | awk '{split($$1,t,/\./) ; print t[1]}')
-HILDON_VERSION_MINOR=$(pkg-config hildon-1 --modversion | awk '{split($$1,t,/\./) ; print t[2]}')
+HILDON_VERSION_MAJOR=$(pkg-config hildon-1 --modversion | awk '{split($0,t,/\./) ; print t[1]}')
+HILDON_VERSION_MINOR=$(pkg-config hildon-1 --modversion | awk '{split($0,t,/\./) ; print t[2]}')
 
 MAEMO_VERSION="1"
 if [ $DBUS_VERSION_MINOR -gt 23 ]; then
@@ -15,8 +15,11 @@ if [ $HILDON_VERSION_MAJOR -eq 1 ]; then
 MAEMO_VERSION="4"
 fi
 
-echo "Maemo version: $MAEMO_VERSION Hildon version: $HILDON_VERSION_MAJOR.$HILDON_VERSION_MINOR"
+if [ $HILDON_VERSION_MAJOR -eq 2 ]; then
+MAEMO_VERSION="4"
+fi
 
+echo "Maemo version: $MAEMO_VERSION Hildon version: $HILDON_VERSION_MAJOR.$HILDON_VERSION_MINOR"
 rm -rf *~
 
 # Build binary package