X-Git-Url: http://git.tuebingen.mpg.de/?p=osl.git;a=blobdiff_plain;f=Makefile;h=f960d69c25ad0aa668c9db9415d08060adbe4360;hp=df1d9f3a426581762b90c8f5931f98e7d37f7626;hb=f0884471639e04bda513bb5a9055d5c00d8c4533;hpb=682d02dc041a714a45f63a4ea199d8a195b1aecb

diff --git a/Makefile b/Makefile
index df1d9f3..f960d69 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
@@ -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.
@@ -107,7 +109,6 @@ ifeq ($(format),elf)
 	LDFLAGS += --shared
 endif
 
-
 all: $(realname) $(executables) $(man_pages)
 Makefile.deps: $(wildcard *.c *.h)
 	$(CC) -MM -MG *.c > $@
@@ -125,7 +126,7 @@ fsck.cmdline.o: fsck.cmdline.c fsck.cmdline.h
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(LIBCFLAGS) $<
 
 fsck.cmdline.h fsck.cmdline.c: fsck.ggo Makefile
-	gengetopt $$O \
+	gengetopt \
 		--conf-parser \
 		--unamed-opts=table \
 		--no-handle-version \
@@ -136,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. */' > $@
@@ -169,12 +170,12 @@ distclean: clean
 	rm -rf web/doxygen
 
 install: all
-	$(MKDIR) $(libdir) $(includedir)
+	$(MKDIR) $(libdir) $(includedir) $(mandir) $(bindir)
 	$(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 644 $(executables) $(bindir)
+	$(INSTALL) -m 755 $(executables) $(bindir)
 	$(INSTALL) -m 644 $(man_pages) $(mandir)
 
 .PHONY: all clean install
@@ -182,8 +183,8 @@ install: all
 web/%.1.html: %.1
 	man2html $< > $@
 
-web/osl.png: web/osl.pdf
-	convert $< $@
+web/osl.png: web/osl.pdf Makefile
+	convert -scale 200x200 $< $@
 
 web/index.html: web/oslfsck.1.html web/index.html.in INSTALL README
 	sed -e '/@README@/,$$d' web/index.html.in > $@