diff --git a/Makefile.opts.in b/Makefile.opts.in index 87d229b..4accd85 100644 --- a/Makefile.opts.in +++ b/Makefile.opts.in @@ -6,7 +6,7 @@ # License as published by the Free Software Foundation version 2.1 # of the License. # -# Copyright (c) 2003-2006 Thomas Graf +# Copyright (c) 2003-2008 Thomas Graf # CC := @CC@ @@ -24,6 +24,7 @@ libdir := @libdir@ includedir := @includedir@ mandir := @mandir@ sysconfdir := @sysconfdir@ +datarootdir := @datarootdir@ AR := ar RM := rm diff --git a/Makefile.rules b/Makefile.rules index 5a1decf..ba5472f 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -6,7 +6,7 @@ # License as published by the Free Software Foundation version 2.1 # of the License. # -# Copyright (c) 2003-2006 Thomas Graf +# Copyright (c) 2003-2008 Thomas Graf # .SUFFIXES: diff --git a/lib/Makefile b/lib/Makefile index 0bf8af7..b5b166c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -35,7 +35,6 @@ OBJ := $(CIN:%.c=%.o) CFLAGS += -fPIC OUT_SLIB := $(PACKAGE_NAME).so.$(PACKAGE_VERSION) LN_SLIB := $(PACKAGE_NAME).so -LN1_SLIB := $(LN_SLIB).1 export @@ -48,11 +47,9 @@ all: $(OUT_SLIB): ../Makefile.opts $(OBJ) @echo " LD $(OUT_SLIB)"; \ - $(CC) -shared -Wl,-soname,libnl.so.1 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc - @echo " LN $(OUT_SLIB) $(LN1_SLIB)"; \ - rm -f $(LN1_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN1_SLIB) + $(CC) -shared -Wl,-soname=libnl.so.1.2 -o $(OUT_SLIB) $(OBJ) $(LIBNL_LIB) -lc @echo " LN $(LN1_SLIB) $(LN_SLIB)"; \ - rm -f $(LN_SLIB) ; $(LN) -s $(LN1_SLIB) $(LN_SLIB) + $(RM) -f $(LN_SLIB) ; $(LN) -s $(OUT_SLIB) $(LN_SLIB) clean: @echo " CLEAN lib"; \ @@ -66,10 +63,6 @@ distclean: install: mkdir -p $(DESTDIR)$(libdir)/ install -m 0644 $(OUT_SLIB) $(DESTDIR)$(libdir) - rm -f $(DESTDIR)$(libdir)/$(LN1_SLIB) - $(LN) -s $(OUT_SLIB) $(DESTDIR)$(libdir)/$(LN1_SLIB) - rm -f $(DESTDIR)$(libdir)/$(LN_SLIB) - $(LN) -s $(LN1_SLIB) $(DESTDIR)$(libdir)/$(LN_SLIB) $(DEPS): ../Makefile.opts