X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2FMakefile;h=6e5006594a1bf104275ad959bae8a4f0c5e4a27c;hp=88752b880e0ecbdfb66fe22cdc0408f28526d0c6;hb=8cc6c96f1b8f77defb953e0d75de790d9737f0c4;hpb=2d82e6f0532295798adec25a52a7d70c85ba4bba

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 88752b880..6e5006594 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -7,7 +7,7 @@
 
 PROG = vol_id
 GEN_HEADERS =
-MAN_PAGES =
+MAN_PAGES = vol_id.8
 
 prefix =
 etcdir =	${prefix}/etc
@@ -18,28 +18,33 @@ libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev/
 
-INSTALL = /usr/bin/install -c
+INSTALL = install -c
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
-INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+INSTALL_SCRIPT = ${INSTALL}
 
-all: $(PROG) $(MAN_PAGES)
+all: lib $(PROG) $(MAN_PAGES)
 .PHONY: all
 .DEFAULT: all
 
+.SUFFIXES:
+
 %.o: %.c $(GEN_HEADERS)
 	$(E) "  CC      " $@
 	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
-libvolume_id/libvolume_id.a:
-	$(Q) $(MAKE) -C libvolume_id
+lib:
+	$(Q) $(MAKE) -C $@
+.PHONY: lib
+
+lib/libvolume_id.a: lib
 
-$(PROG): %: $(HEADERS) %.o libvolume_id/libvolume_id.a
+$(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
 	$(E) "  LD      " $@
-	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) libvolume_id/libvolume_id.a $(LIB_OBJS)
-ifneq ($(strip $(STRIPCMD)),)
-	$(E) "  STRIP   " $@
-	$(Q) $(STRIPCMD) $@
+ifeq ($(strip $(VOLUME_ID_STATIC)),true)
+	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
+else
+	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
 endif
 
 # man pages
@@ -51,22 +56,22 @@ endif
 clean:
 	$(E) "  CLEAN   "
 	$(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
-	$(Q) $(MAKE) -C libvolume_id clean
+	$(Q) $(MAKE) -C lib clean
 .PHONY: clean
 
 install-bin: all
-	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
-	$(MAKE) -C libvolume_id install
+	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)
+	$(MAKE) -C lib install
 .PHONY: install-bin
 
 uninstall-bin:
-	- rm $(DESTDIR)$(sbindir)/$(PROG)
-	$(MAKE) -C libvolume_id uninstall
+	- rm $(DESTDIR)$(libudevdir)/$(PROG)
+	$(MAKE) -C lib uninstall
 .PHONY: uninstall-bin
 
 install-man:
 	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
-.PHONY: uninstall-man
+.PHONY: install-man
 
 uninstall-man:
 	-rm -f $(DESTDIR)$(mandir)/man8/$(PROG).8