X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=bd78f444c506eee885597c9d783ccc60ab0da80d;hp=affd16afbd3855fa5d6900c97fae33fab43d19ae;hb=0325941fff60888ff3486f271b0d513a75f9a324;hpb=9f19a44770548dca87d3699c997921e88eeec459

diff --git a/Makefile.am b/Makefile.am
index affd16afb..bd78f444c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,9 +207,8 @@ define move-to-rootlibdir
 	if test "$(libdir)" != "$(rootlibdir)"; then \
 		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
-		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
 		rm -f $(DESTDIR)$(libdir)/$$libname && \
-		$(LN_S) --relative -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+		$(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
 		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
 	fi
 endef
@@ -2453,6 +2452,7 @@ libsystemd_network_la_SOURCES = \
 	src/libsystemd-network/ipv4ll-internal.h
 
 libsystemd_network_la_LIBADD = \
+	libsystemd-label.la \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
@@ -2474,6 +2474,7 @@ test_dhcp_client_SOURCES = \
 
 test_dhcp_client_LDADD = \
 	libsystemd-network.la \
+	libsystemd-label.la \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
@@ -4963,7 +4964,7 @@ kdbus-update:
 	wget -N https://d-bus.googlecode.com/git/kdbus.h )
 
 .PHONY: upload
-upload: all check
+upload: all check dist
 	cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
 	scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
 	scp man/*.html tango:public/systemd-man/