summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am23
-rw-r--r--configure.ac1
-rw-r--r--debian/vyatta-cfg.install1
3 files changed, 15 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index a424d2f..86db597 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,14 +102,17 @@ install-exec-hook:
mkdir -p $(DESTDIR)$(commit_run_dir)
mkdir -p $(DESTDIR)$(etc_shell_leveldir)
cd etc/shell/level; $(cpiop) $(DESTDIR)$(etc_shell_leveldir)
- cd $(DESTDIR)/opt/vyatta/sbin; \
- ln -sf my_cli_bin my_set; \
- ln -sf my_cli_bin my_delete; \
- ln -sf my_cli_bin my_activate; \
- ln -sf my_cli_bin my_deactivate; \
- ln -sf my_cli_bin my_rename; \
- ln -sf my_cli_bin my_copy; \
- ln -sf my_cli_bin my_comment; \
- ln -sf my_cli_bin my_discard; \
- ln -sf my_cli_bin my_move
+ cd $(DESTDIR)$(sbindir); \
+ $(LN_S) my_cli_bin my_set; \
+ $(LN_S) my_cli_bin my_delete; \
+ $(LN_S) my_cli_bin my_activate; \
+ $(LN_S) my_cli_bin my_deactivate; \
+ $(LN_S) my_cli_bin my_rename; \
+ $(LN_S) my_cli_bin my_copy; \
+ $(LN_S) my_cli_bin my_comment; \
+ $(LN_S) my_cli_bin my_discard; \
+ $(LN_S) my_cli_bin my_move
+ mkdir -p $(DESTDIR)/bin
+ cd $(DESTDIR)/bin ; \
+ $(LN_S) $(sbindir)/my_cli_shell_api cli-shell-api
diff --git a/configure.ac b/configure.ac
index 0a8b77b..04210fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ AM_PROG_CC_C_O
AC_PROG_LIBTOOL
AC_PROG_LEX
AC_PROG_YACC
+AC_PROG_LN_S
AC_ARG_ENABLE([nostrip],
AC_HELP_STRING([--enable-nostrip],
diff --git a/debian/vyatta-cfg.install b/debian/vyatta-cfg.install
index 5c1fdb4..b2385da 100644
--- a/debian/vyatta-cfg.install
+++ b/debian/vyatta-cfg.install
@@ -2,3 +2,4 @@ etc
opt/vyatta/share/enumeration
opt/vyatta/sbin
opt/vyatta/etc
+bin