X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=b0f78b012ee2f56246c66106b09521238e94d797;hp=703238b13a35b652b57d6e6f9e3fd029f5e8ae12;hb=4f3d440fc9b281155df9ba3df1799e3474cc4584;hpb=4b9d7b591331f9917aa97520458e983e100ef733

diff --git a/Makefile b/Makefile
index 703238b..b0f78b0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 # where to install
-prefix := /usr/local
-libdir := $(prefix)/lib
-includedir := $(prefix)/include
-bindir := $(prefix)/bin
-mandir := $(prefix)/man/man1
+PREFIX ?= /usr/local
+libdir := $(PREFIX)/lib
+includedir := $(PREFIX)/include
+bindir := $(PREFIX)/bin
+mandir := $(PREFIX)/man/man1
 
 objects := osl.o util.o rbtree.o sha1.o
 fsck_objects := fsck.fsck.o osl.fsck.o util.fsck.o rbtree.fsck.o sha1.fsck.o fsck.cmdline.o
@@ -12,7 +12,9 @@ executables := oslfsck
 man_pages := oslfsck.1
 
 INSTALL := install
-CC := gcc
+ifeq "$(origin CC)" "default"
+        CC := gcc
+endif
 MKDIR := mkdir -p
 RM := rm -f
 LN := ln
@@ -21,7 +23,7 @@ LN := ln
 # The way x, y and z are interpreted depends on the OS.
 x := 0
 y := 1
-z := 0
+z := 1
 VERSION := $(x).$(y).$(z)
 
 # common flags
@@ -56,7 +58,7 @@ ifeq ($(uname_s),Darwin)
 	# Darwin has its own idea on version numbers:
 	realname := lib$(libname).$(x).dylib
 	soname := $(realname)
-	linkername := lib$(libname).so
+	linkername := lib$(libname).dylib
 	# The minor version number is an incremental number using the format
 	# X[.Y[.Z]]. To set the minor version number of a dynamic library, use
 	# the gcc -current_version option.
@@ -135,13 +137,13 @@ fsck.cmdline.h fsck.cmdline.c: fsck.ggo Makefile
 		< $<
 
 oslfsck: $(fsck_objects)
-	$(CC) -o $@ $(fsck_objects) -lcrypto
+	$(CC) -o $@ $(fsck_objects)
 
 oslfsck.1: oslfsck
 	help2man -h --detailed-help -N ./$< > $@
 
 $(realname): $(objects)
-	$(CC) $(LDFLAGS) -o $@ $(objects) -lcrypto
+	$(CC) $(LDFLAGS) -o $@ $(objects)
 
 osl_errors.h: errlist
 	echo '/** public error codes of the osl library. */' > $@
@@ -167,16 +169,24 @@ distclean: clean
 	rm -f web/index.html web/oslfsck.1.html web/osl.png
 	rm -rf web/doxygen
 
-install: all
-	$(MKDIR) $(libdir) $(includedir) $(mandir) $(bindir)
+install-bin: $(executables)
+	$(MKDIR) $(bindir)
+	$(INSTALL) -m 755 $(executables) $(bindir)
+
+install-man: $(man_pages)
+	$(MKDIR) $(mandir)
+	$(INSTALL) -m 644 $(man_pages) $(mandir)
+
+install-lib: $(realname) $(headers)
+	$(MKDIR) $(libdir) $(includedir)
 	$(RM) $(libdir)/$(linkername)
 	$(LN) -s $(libdir)/$(soname) $(libdir)/$(linkername)
-	$(INSTALL) -s -m 755 $(realname) $(libdir)
+	$(INSTALL) -m 755 $(realname) $(libdir)
 	$(INSTALL) -m 644 $(headers) $(includedir)
-	$(INSTALL) -m 755 $(executables) $(bindir)
-	$(INSTALL) -m 644 $(man_pages) $(mandir)
 
-.PHONY: all clean install
+install: all install-bin install-man install-lib
+
+.PHONY: all clean install install-bin install-man install-lib
 
 web/%.1.html: %.1
 	man2html $< > $@