diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-24 13:53:19 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-24 13:53:19 +0200 |
| commit | 7783387b978e5c13a415d0076ab9ff8e1c45bf4c (patch) | |
| tree | a8d4115bec965be72f08b668fc777d85987cdd9b /Makefile | |
| parent | bd275d73ac06823619230915a3aa29deddc996fb (diff) | |
| parent | 4cf4b9ca28a7a8918bec6198c51af97f96712ba6 (diff) | |
| download | subsurface-7783387b978e5c13a415d0076ab9ff8e1c45bf4c.tar.gz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 14 insertions, 4 deletions
@@ -24,17 +24,27 @@ MANFILES = $(NAME).1 # 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 @@ 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 |