X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2FMakefile.am;h=e83888617a7dfdf0f2e6a1cd6d971ebffb90b780;hb=cf5bd04073671df31dbbaf525f870366b37e5256;hp=1f0bf2f3ad3a37bab90767f127baf1d903b9effc;hpb=48a9b173e88738ff4eefb3519f1d27711b417c8d;p=elogind.git

diff --git a/libudev/Makefile.am b/libudev/Makefile.am
index 1f0bf2f3a..e83888617 100644
--- a/libudev/Makefile.am
+++ b/libudev/Makefile.am
@@ -1,5 +1,8 @@
 include $(top_srcdir)/Makefile.am.inc
 
+SUBDIRS = \
+	docs
+
 noinst_PROGRAMS = \
 	test-libudev
 
@@ -9,8 +12,7 @@ test_libudev_SOURCES = \
 test_libudev_LDADD = \
 	libudev.la
 
-rootlibdir = $(exec_prefix)/$(libdir_name)
-rootlib_LTLIBRARIES = \
+lib_LTLIBRARIES = \
 	libudev.la
 
 include_HEADERS =\
@@ -26,29 +28,29 @@ libudev_la_SOURCES =\
 	libudev-monitor.c \
 	libudev-queue.c
 
+LT_CURRENT=5
+LT_REVISION=0
+LT_AGE=5
 libudev_la_LDFLAGS = \
-	-version-info $(LIBUDEV_LT_CURRENT):$(LIBUDEV_LT_REVISION):$(LIBUDEV_LT_AGE) \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	-export-symbols $(top_srcdir)/libudev/exported_symbols
 
-pkgconfigdir = $(prefix)/$(libdir_name)/pkgconfig
-pkgconfig_DATA = libudev.pc
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = \
+	libudev.pc
 
 EXTRA_DIST = \
 	exported_symbols
 
-# move devel files to $(prefix)$(libdir_name) if needed
-install-data-hook:
-	rm  $(DESTDIR)$(rootlibdir)/libudev.la
-	if test "$(prefix)" != "$(exec_prefix)"; then \
-		mkdir -p $(DESTDIR)$(prefix)/$(libdir_name); \
-		mv $(DESTDIR)$(rootlibdir)/libudev.a $(DESTDIR)$(prefix)/$(libdir_name)/; \
-		so_img_name=$$(readlink $(DESTDIR)$(rootlibdir)/libudev.so); \
-		rm $(DESTDIR)$(rootlibdir)/libudev.so; \
-		so_img_rel_target_prefix=$$(echo $(prefix)/$(libdir_name) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \
-		ln -sf  $$so_img_rel_target_prefix$(exec_prefix)/$(libdir_name)/$$so_img_name \
-			$(DESTDIR)$(prefix)/$(libdir_name)/libudev.so; \
+# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
+install-exec-hook:
+	if test "$(libdir)" != "$(rootlib_execdir)"; then \
+		mkdir -p $(DESTDIR)$(rootlib_execdir) && \
+		so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
+		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+		ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
+		mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \
 	fi
 
 uninstall-hook:
-	rm -f $(DESTDIR)$(prefix)/$(libdir_name)/libudev.a
-	rm -f $(DESTDIR)$(prefix)/$(libdir_name)/libudev.so*
+	rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*