Rename cd/umask to execline-cd/execline-umask, make symlinks, etc.

2 files changed, 19 insertions, 15 deletions

diff --git a/package/deps.mak b/package/deps.mak
index f944bc7..3aac760 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -4,7 +4,6 @@
 
 src/execline/background.o src/execline/background.lo: src/execline/background.c src/include/execline/execline.h
 src/execline/backtick.o src/execline/backtick.lo: src/execline/backtick.c src/include/execline/execline.h
-src/execline/cd.o src/execline/cd.lo: src/execline/cd.c
 src/execline/define.o src/execline/define.lo: src/execline/define.c src/include-local/exlsn.h
 src/execline/dollarat.o src/execline/dollarat.lo: src/execline/dollarat.c
 src/execline/elgetopt.o src/execline/elgetopt.lo: src/execline/elgetopt.c src/include/execline/execline.h
@@ -13,6 +12,8 @@ src/execline/elglob.o src/execline/elglob.lo: src/execline/elglob.c src/include-
 src/execline/emptyenv.o src/execline/emptyenv.lo: src/execline/emptyenv.c src/include/execline/execline.h
 src/execline/envfile.o src/execline/envfile.lo: src/execline/envfile.c
 src/execline/exec.o src/execline/exec.lo: src/execline/exec.c
+src/execline/execline-cd.o src/execline/execline-cd.lo: src/execline/execline-cd.c
+src/execline/execline-umask.o src/execline/execline-umask.lo: src/execline/execline-umask.c
 src/execline/execlineb.o src/execline/execlineb.lo: src/execline/execlineb.c src/include/execline/execline.h src/include-local/exlsn.h
 src/execline/exit.o src/execline/exit.lo: src/execline/exit.c
 src/execline/export.o src/execline/export.lo: src/execline/export.c
@@ -44,7 +45,6 @@ src/execline/runblock.o src/execline/runblock.lo: src/execline/runblock.c src/in
 src/execline/shift.o src/execline/shift.lo: src/execline/shift.c src/include/execline/execline.h
 src/execline/trap.o src/execline/trap.lo: src/execline/trap.c src/include/execline/execline.h
 src/execline/tryexec.o src/execline/tryexec.lo: src/execline/tryexec.c src/include/execline/execline.h
-src/execline/umask.o src/execline/umask.lo: src/execline/umask.c
 src/execline/unexport.o src/execline/unexport.lo: src/execline/unexport.c
 src/execline/wait.o src/execline/wait.lo: src/execline/wait.c src/include/execline/execline.h
 src/execline/withstdinas.o src/execline/withstdinas.lo: src/execline/withstdinas.c
@@ -78,8 +78,6 @@ background: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
 background: src/execline/background.o ${LIBEXECLINE}
 backtick: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
 backtick: src/execline/backtick.o ${LIBEXECLINE}
-cd: EXTRA_LIBS := -lskarnet
-cd: src/execline/cd.o
 define: EXTRA_LIBS := -lskarnet
 define: src/execline/define.o ${LIBEXECLINE}
 dollarat: EXTRA_LIBS := -lskarnet
@@ -96,6 +94,10 @@ envfile: EXTRA_LIBS := -lskarnet
 envfile: src/execline/envfile.o
 exec: EXTRA_LIBS := -lskarnet
 exec: src/execline/exec.o
+execline-cd: EXTRA_LIBS := -lskarnet
+execline-cd: src/execline/execline-cd.o
+execline-umask: EXTRA_LIBS := -lskarnet
+execline-umask: src/execline/execline-umask.o
 execlineb: EXTRA_LIBS := -lskarnet
 execlineb: src/execline/execlineb.o ${LIBEXECLINE}
 exit: EXTRA_LIBS := -lskarnet
@@ -158,8 +160,6 @@ trap: EXTRA_LIBS := -lskarnet ${SPAWN_LIB}
 trap: src/execline/trap.o ${LIBEXECLINE}
 tryexec: EXTRA_LIBS := -lskarnet
 tryexec: src/execline/tryexec.o ${LIBEXECLINE}
-umask: EXTRA_LIBS := -lskarnet
-umask: src/execline/umask.o
 unexport: EXTRA_LIBS := -lskarnet
 unexport: src/execline/unexport.o
 wait: EXTRA_LIBS := -lskarnet
diff --git a/package/targets.mak b/package/targets.mak
index b502988..be4764d 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -1,7 +1,6 @@
 BIN_TARGETS := \
 background \
 backtick \
-cd \
 define \
 dollarat \
 elgetopt \
@@ -11,6 +10,8 @@ emptyenv \
 envfile \
 exec \
 execlineb \
+execline-cd \
+execline-umask \
 exit \
 export \
 fdblock \
@@ -36,12 +37,13 @@ multidefine \
 multisubstitute \
 pipeline \
 piperw \
+posix-cd \
+posix-umask \
 redirfd \
 runblock \
 shift \
 trap \
 tryexec \
-umask \
 unexport \
 wait \
 withstdinas
@@ -51,13 +53,15 @@ LIBEXEC_TARGETS :=
 LIB_DEFS := EXECLINE=execline
 
 ifeq ($(PEDANTIC_POSIX),1)
+PEDANTIC_PREFIX := posix
+else
+PEDANTIC_PREFIX := execline
+endif
 
-BIN_TARGETS += posix-cd posix-umask
-
-$(DESTDIR)$(bindir)/cd: $(DESTDIR)$(bindir)/posix-cd
-	exec ./tools/install.sh -l posix-cd $(DESTDIR)$(bindir)/cd
+install-bin: $(DESTDIR)$(bindir)/cd $(DESTDIR)$(bindir)/umask
 
-$(DESTDIR)$(bindir)/umask: $(DESTDIR)$(bindir)/posix-umask
-	exec ./tools/install.sh -l posix-umask $(DESTDIR)$(bindir)/umask
+$(DESTDIR)$(bindir)/cd: $(DESTDIR)$(bindir)/$(PEDANTIC_PREFIX)-cd
+	exec ./tools/install.sh -l $(PEDANTIC_PREFIX)-cd $(DESTDIR)$(bindir)/cd
 
-endif
+$(DESTDIR)$(bindir)/umask: $(DESTDIR)$(bindir)/$(PEDANTIC_PREFIX)-umask
+	exec ./tools/install.sh -l $(PEDANTIC_PREFIX)-umask $(DESTDIR)$(bindir)/umask