From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Oct 2011 11:53:19 +0000 (+0200)
Subject: Merge branch 'bugfixes' of git://github.com/dirkhh/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=7783387b978e5c13a415d0076ab9ff8e1c45bf4c;hp=-c;p=ext%2Fsubsurface.git

Merge branch 'bugfixes' of git://github.com/dirkhh/subsurface

* 'bugfixes' of git://github.com/dirkhh/subsurface:
  Updated changes file
  Create packaging directory and add spec and changes file
  Makefile fixes
---

7783387b978e5c13a415d0076ab9ff8e1c45bf4c
diff --combined Makefile
index 972c232,2d86d48..4be5991
--- a/Makefile
+++ b/Makefile
@@@ -1,4 -1,4 +1,4 @@@
 -VERSION=1.0
 +VERSION=1.1
  
  CC=gcc
  CFLAGS=-Wall -Wno-pointer-sign -g
@@@ -24,17 -24,27 +24,27 @@@ MANFILES = $(NAME).
  # libdivecomputer still is - so we check /usr/local and /usr and then we
  # give up. You can override by simply setting it here
  #
- libdc-local := $(wildcard /usr/local/include/libdivecomputer/*)
- libdc-usr := $(wildcard /usr/include/libdivecomputer/*)
+ libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
+ libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
+ libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
+ libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
  
  ifneq ($(strip $(libdc-local)),)
  	LIBDIVECOMPUTERDIR = /usr/local
  	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
  	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
+ else ifneq ($(strip $(libdc-local64)),)
+ 	LIBDIVECOMPUTERDIR = /usr/local
+ 	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+ 	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
  else ifneq ($(strip $(libdc-usr)),)
  	LIBDIVECOMPUTERDIR = /usr
  	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
  	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
+ else ifneq ($(strip $(libdc-usr64)),)
+ 	LIBDIVECOMPUTERDIR = /usr
+ 	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+ 	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
  else
  $(error Cannot find libdivecomputer - please edit Makefile)
  endif
@@@ -67,8 -77,8 +77,8 @@@ install: $(NAME
  	$(INSTALL) -d -m 755 $(ICONDIR)
  	$(INSTALL) $(ICONFILE) $(ICONDIR)
  	$(gtk_update_icon_cache)
- 	$(INSTALL) -d -m 644 $(MANDIR)
- 	$(INSTALL) $(MANFILES) $(MANDIR)
+ 	$(INSTALL) -d -m 755 $(MANDIR)
+ 	$(INSTALL) -m 644 $(MANFILES) $(MANDIR)
  
  parse-xml.o: parse-xml.c dive.h
  	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c
@@@ -103,7 -113,7 +113,7 @@@ libdivecomputer.o: libdivecomputer.c di
  			$(LIBDIVECOMPUTERCFLAGS) \
  			-c libdivecomputer.c
  
 -gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h
 +gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h Makefile
  	$(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0 glib-2.0 gconf-2.0` \
  			$(LIBDIVECOMPUTERCFLAGS) \
  			-DVERSION_STRING='"v$(VERSION)"' \