diff options
| author | Min Kang <min1023.kang@samsung.com> | 2016-01-05 17:20:17 +0900 |
|---|---|---|
| committer | Min Kang <min1023.kang@samsung.com> | 2016-01-05 17:21:33 +0900 |
| commit | 30dfab97fe29921360d29c5b904d614dcb9e8fa4 (patch) | |
| tree | d6909f3ff6214d95756bf32f19f990430cc16f99 | |
| parent | a70e7d51b37c19ce3249273259227dc857ebb534 (diff) | |
| download | systemd-30dfab97fe29921360d29c5b904d614dcb9e8fa4.tar.gz systemd-30dfab97fe29921360d29c5b904d614dcb9e8fa4.tar.bz2 systemd-30dfab97fe29921360d29c5b904d614dcb9e8fa4.zip | |
build: remove --relative in 'ln'submit/tizen/20160105.083334submit/tizen/20160105.083230accepted/tizen/wearable/20160106.003356accepted/tizen/tv/20160106.003255accepted/tizen/mobile/20160106.003421
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>
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 92444015c3..d868b32635 100644 --- a/Makefile.am +++ b/Makefile.am @@ -234,11 +234,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 = RUNLEVEL1_TARGET_WANTS = @@ -314,7 +316,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 @@ -2537,7 +2539,7 @@ systemd_dbus1_generator_LDADD = \ dbus1-generator-install-hook: $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator - $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(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 diff --git a/configure.ac b/configure.ac index 7db969003c..537b2109a0 100644 --- a/configure.ac +++ b/configure.ac @@ -100,7 +100,7 @@ AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin]) AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$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= |