X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=libudev%2FMakefile.am;h=3ed05a31e3b9a85f816ec0910388fdfa63860057;hb=182c9b158495b55212651ed5e57d0d486a6ba781;hp=e58786531c167b1c96e8b90000241c42f85339bf;hpb=1b98ae83be69f805f8197caa42a304e851dd7f95;p=elogind.git

diff --git a/libudev/Makefile.am b/libudev/Makefile.am
index e58786531..3ed05a31e 100644
--- a/libudev/Makefile.am
+++ b/libudev/Makefile.am
@@ -12,8 +12,7 @@ test_libudev_SOURCES = \
 test_libudev_LDADD = \
 	libudev.la
 
-rootlibdir = $(exec_prefix)/$(libdir_name)
-rootlib_LTLIBRARIES = \
+lib_LTLIBRARIES = \
 	libudev.la
 
 include_HEADERS =\
@@ -29,32 +28,29 @@ libudev_la_SOURCES =\
 	libudev-monitor.c \
 	libudev-queue.c
 
-LIBUDEV_LT_CURRENT=4
-LIBUDEV_LT_REVISION=0
-LIBUDEV_LT_AGE=4
+LT_CURRENT=4
+LT_REVISION=1
+LT_AGE=4
 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*