build: remove --relative in 'ln'
authorMin Kang <min1023.kang@samsung.com>
Tue, 5 Jan 2016 08:20:17 +0000 (17:20 +0900)
committerŁukasz Stelmach <l.stelmach@samsung.com>
Fri, 24 Feb 2017 15:08:15 +0000 (16:08 +0100)
removing --relative option in Makefile.am and configure.ac
 for coreutils

TIZEN SPECIFIC

Change-Id: If623dd6175507d62f0b34349aacecb8244882e4f
Signed-off-by: Min Kang <min1023.kang@samsung.com>
Makefile.am
configure.ac

index d24a189..4c95184 100644 (file)
@@ -255,11 +255,13 @@ define move-to-rootlibdir
                $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
                so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
                rm -f $(DESTDIR)$(libdir)/$$libname && \
-               $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+               cd $(DESTDIR); $(LN_S) -f ./$(rootlibdir)/$$so_img_name ./$(libdir)/$$libname && \
                mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
        fi
 endef
 
+
+
 INSTALL_DIRS =
 
 SHUTDOWN_TARGET_WANTS =
@@ -329,7 +331,7 @@ define install-relative-aliases
        while [ -n "$$1" ]; do \
                $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
                rm -f $(DESTDIR)$$dir/$$2 && \
-               $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
+               cd $(DESTDIR); $(LN_S) ./$$1 ./$$dir/$$2 && \
                shift 2 || exit $$?; \
        done
 endef
@@ -2960,6 +2962,25 @@ systemd_gpt_auto_generator_CFLAGS = \
 endif
 
 # ------------------------------------------------------------------------------
+systemgenerator_PROGRAMS +=  \
+       systemd-dbus1-generator
+
+systemd_dbus1_generator_SOURCES = \
+       src/dbus1-generator/dbus1-generator.c
+
+systemd_dbus1_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+dbus1-generator-install-hook:
+       $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
+       $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+       cd $(DESTDIR); $(AM_V_LN)$(LN_S) -f ./$(systemgeneratordir)/systemd-dbus1-generator ./$(usergeneratordir)/systemd-dbus1-generator
+
+dbus1-generator-uninstall-hook:
+       rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+
 dist_xinitrc_SCRIPTS = \
        xorg/50-systemd-user.sh
 
index cf595e6..057beaa 100644 (file)
@@ -110,7 +110,7 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
 AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
 AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
 
-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
+#AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
 
 M4_DEFINES=