Makefile updates

Makefile.in

@@ -1,16 +1,17 @@
 #
 # Makefile.in	Makefile for the liblockfile package
 #
-# version:	@(#)Makefile.in  1.01  16-Apr-1999  miquels@cistron.nl
-#
 
-VER	= 1.0
-NVER	= 0.1
+MAJOR		= 1
+SOVER		= 1.0
+NFSVER		= 0.1
 
 CFLAGS		= @CFLAGS@ -I.
 LDFLAGS		= @LDFLAGS@
 CC		= @CC@
 
+ROOT		:= $(DESTDIR)
+
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
@@ -25,8 +26,8 @@ all:		@TARGETS@
 install:	@INSTALL_TARGETS@
 
 static:		liblockfile.a dotlockfile
-shared:		liblockfile.so dotlockfile
-nfslib:		nfslock.so.$(NVER)
+shared:		liblockfile.so liblockfile.a dotlockfile
+nfslib:		nfslock.so.$(NFSVER)
 
 liblockfile.a:	lockfile.o
 		$(AR) rv liblockfile.a lockfile.o
@@ -35,9 +36,9 @@ liblockfile.so: liblockfile.a
 		$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,liblockfile.so.1 \
 			-o liblockfile.so lockfile.o -lc
 
-nfslock.so.$(NVER):	nfslock.o
+nfslock.so.$(NFSVER):	nfslock.o
 		$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,nfslock.so.0 \
-			-o nfslock.so.$(NVER) nfslock.o
+			-o nfslock.so.$(NFSVER) nfslock.o
 
 dotlockfile:	dotlockfile.o xlockfile.o
 		$(CC) $(LDFLAGS) -o dotlockfile dotlockfile.o xlockfile.o
@@ -50,15 +51,22 @@ xlockfile.o:	lockfile.c
 		$(CC) $(CFLAGS) -c lockfile.c -o xlockfile.o
 
 install_static:	static install_common
+		install -d -m 755 -g root -p $(ROOT)$(libdir)
 		install -m 644 liblockfile.a $(ROOT)$(libdir)
 
-install_shared:	shared install_common
+install_shared:	shared install_static install_common
+		install -d -m 755 -g root -p $(ROOT)$(libdir)
 		install -m 755 liblockfile.so \
-			$(ROOT)$(libdir)/liblockfile.so.$(VER)
-		ln -s liblockfile.so.$(VER) $(ROOT)$(libdir)/liblockfile.so
+			$(ROOT)$(libdir)/liblockfile.so.$(SOVER)
+		ln -s liblockfile.so.$(SOVER) $(ROOT)$(libdir)/liblockfile.so.$(MAJOR)
+		ln -s liblockfile.so.$(SOVER) $(ROOT)$(libdir)/liblockfile.so
 		if test "$(ROOT)" = ""; then @LDCONFIG@; fi
 
 install_common:
+		install -d -m 755 -g root -p $(ROOT)$(includedir)
+		install -d -m 755 -g root -p $(ROOT)$(bindir)
+		install -d -m 755 -g root -p $(ROOT)$(mandir)/man1
+		install -d -m 755 -g root -p $(ROOT)$(mandir)/man3
 		install -m 644 lockfile.h maillock.h $(ROOT)$(includedir)
 		if [ "$(MAILGROUP)" != "" ]; then\
 		  install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\
@@ -69,7 +77,8 @@ install_common:
 		install -m 644 *.3 $(ROOT)$(mandir)/man3
 
 install_nfslib:	nfslib
-		install -m 755 nfslock.so.$(NVER) $(ROOT)$(nfslockdir)
+		install -d -m 755 -g root -p $$(ROOT)$(nfslockdir)
+		install -m 755 nfslock.so.$(NFSVER) $(ROOT)$(nfslockdir)
 		if test "$(ROOT)" = ""; then @LDCONFIG@; fi
 
 clean: