about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-08-26 16:22:38 -0400
committerJune McEnroe <june@causal.agency>2021-08-26 16:22:38 -0400
commit42903aa6d5482af2377170017dd8d12c66cc1c2d (patch)
treef432d645f62e3fdaf2ea6891e03c0543e9ac6198 /Makefile
parentAdd version number generator (diff)
downloadexman-42903aa6d5482af2377170017dd8d12c66cc1c2d.tar.gz
exman-42903aa6d5482af2377170017dd8d12c66cc1c2d.zip
Support DESTDIR in install/uninstall
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8


1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 44bdf1c..9f4c5c7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,15 +28,15 @@ clean:
 .endfor
 
 install: exman exman.1
-	install -d ${PREFIX}/bin ${MANDIR}/man1
-	install exman ${PREFIX}/bin
-	install -m 644 exman.1 ${MANDIR}/man1
+	install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
+	install exman ${DESTDIR}${PREFIX}/bin
+	install -m 644 exman.1 ${DESTDIR}${MANDIR}/man1
 .for system in ${SYSTEMS}
 	${MAKE} -C ${system} ${.TARGET}
 .endfor
 
 uninstall:
-	rm -f ${PREFIX}/bin/exman ${MANDIR}/man1/exman.1
+	rm -f ${DESTDIR}${PREFIX}/bin/exman ${DESTDIR}${MANDIR}/man1/exman.1
 .for system in ${SYSTEMS}
 	${MAKE} -C ${system} ${.TARGET}
 .endfor

 

generated by cgit-pink 1.4.1 (git 2.36.1) at 2026-09-06 13:04:01 +0000


 


nd with glibc hacked to not provide PRIdMAX.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2013-08-23[EXPAND] Propagate EXP_QPAT in subevalvarHerbert Xu

On Tue, Aug 28, 2012 at 01:27:24PM +0000, Todor Vlaev wrote:
> 
> While playing around with parameter expansion I noticed that the
> following didn't work in dash  (dash 0.5.5.1-7.4ubuntu1) as compared
> to bash even though I believe it should be POSIX-compliant:
> 
> my_str=swan; last_char="${my_str#${my_str%?}}"; echo ${last_char}
> 
> If the double quotes are removed, the last character is printed correctly.
> 
> At a quick glance through the commits after the 0.5.5.1 release I saw
> the following bug fix. Could it be related?
> 
> 0d7d66039b614b642c775432fd64aa8c11f9a64d
> [EXPAND] Fix quoted pattern patch breakage

We need to propagate EXP_QPAT in subevalvar as otherwise a nested
parameter expansion within subevalvar may be expanded incorrectly.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2013-08-23[MAN] Fix typo for waitKimo Rosenbaum

This is a small patch to fix the paragraph about 'wait' in the dash manpage.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2012-07-03[BUILTIN] Add support for ulimit -rChristoph Mathys

I recently found myself in need to have dash support 'ulimit -r' to
set maximum realtime priority. Attached is a patch that adds the
parameter to the builtin ulimit command and updates the manpage.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2012-07-03Avoid overflow for very long variable nameJim Meyering

Otherwise, this:
  $ perl -le 'print "v"x(2**31+1) ."=1"' | dash
provokes integer overflow:

  (gdb) bt
  #0  doformat (dest=0x61d580, f=0x416a08 "%s: %d: %s: ", ap=0x7fffffffd308)
      at output.c:310
  #1  0x00000000004128c1 in outfmt (file=0x61d580, fmt=0x416a08 "%s: %d: %s: ")
      at output.c:257
  #2  0x000000000040382e in exvwarning2 (msg=0x417339 "Out of space",
      ap=0x7fffffffd468) at error.c:125
  #3  0x000000000040387e in exverror (cond=1, msg=0x417339 "Out of space",
      ap=0x7fffffffd468) at error.c:156
  #4  0x0000000000403938 in sh_error (msg=0x417339 "Out of space") at error.c:172
  #5  0x000000000040c970 in ckmalloc (nbytes=18446744071562067984)
      at memalloc.c:57
  #6  0x000000000040ca78 in stalloc (nbytes=18446744071562067972)
      at memalloc.c:132
  #7  0x000000000040ece9 in grabstackblock (len=18446744071562067972)
      at memalloc.h:67
  #8  0x00000000004106b5 in readtoken1 (firstc=118, syntax=0x419522 "",
      eofmark=0x0, striptabs=0) at parser.c:1040
  #9  0x00000000004101a4 in xxreadtoken () at parser.c:826
  #10 0x000000000040fe1d in readtoken () at parser.c:697
  #11 0x000000000040edcc in parsecmd (interact=0) at parser.c:145
  #12 0x000000000040c679 in cmdloop (top=1) at main.c:224
  #13 0x000000000040c603 in main (argc=2, argv=0x7fffffffd9f8) at main.c:178

  #8  0x00000000004106b5 in readtoken1 (firstc=118, syntax=0x419522 "",
      eofmark=0x0, striptabs=0) at parser.c:1040
  1040    grabstackblock(len);
  (gdb) p len
  $30 = -2147483644

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2012-02-25[VAR] Sanitise environment variable names on entryHerbert Xu

On Tue, Feb 14, 2012 at 10:48:48AM +0000, harald@redhat.com wrote:
> 
> "export -p" prints all environment variables, without checking if the
> environment variable is a valid dash variable name.
> 
> IMHO, the only valid usecase for "export -p" is to eval the output.
> 
> $ eval $(export -p); echo OK
> OK
> 
> Without this patch the following test does error out with:
> 
> test.py:
> import os
> os.environ["test-test"]="test"
> os.environ["test_test"]="test"
> os.execv("./dash", [ './dash', '-c', 'eval $(export -p); echo OK' ])
> 
> $ python test.py
> ./dash: 1: export: test-test: bad variable name
> 
> Of course the results can be more evil, if the environment variable
> name is crafted, that it injects valid shell code.

This patch fixes the issue by sanitising all environment variable names
upon entry into the shell.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2011-08-17[SHELL] Add top-level autogen.shDavid S. Miller

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2011-08-17[SHELL] Allow building without LINEO supportDavid S. Miller

Simply specify --disable-lineno to configure.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2011-08-17[ARITH] Avoid imaxdiv when only one of the results is wantedHarald van Dijk

dash rather pointlessly calls imaxdiv, only to discard one of its
results. The call was already made conditional a while back because some
systems don't have imaxdiv, but the generated code for the version with
imaxdiv and the one with / and % is identical (with GCC 4.6.1 or ICC
12.0.2, with -O0, -O2 or -Os), so it could just as well go entirely to
clean up the code a little bit.

Signed-off-by: Harald van Dijk <harald@gigawatt.nl>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2011-07-15[SHELL] Fix klibc DEBUG compilationmaximilian attems

dash didn't compile in DEBUG mode against klibc for all long time.
Now it only fails at link stage for not having setlinebuf(3) and
freopen(3).

Fixes:

usr/dash/show.o: In function `opentrace':
show.c:(.text+0x36): undefined reference to `freopen'
show.c:(.text+0x86): undefined reference to `setlinebuf'

Skip setlinebuf and use fclose/fopen inside __KLIBC__
Compile tested with debug in klibc and against glibc in dash repo.

Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2011-07-09[BUILTIN] Merge SKIPFUNC/SKIPFILE and only clear SKIPFUNC when leaving dotcmdHerbert Xu

Currently upon leaving a dotcmd the evalskip state is reset so
if a continue/break statement is used within a dot script it would
have no effect outside of the dot script.

This is inconsistent with other shells.

This patch is based on one by Jilles Tjoelker and only clears
SKIPFUNC when leaving a dot script.  As a result continue/break
will remain in effect.

It also merges SKIPFUNC/SKIPFILE as they have no practical difference.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2011-07-08Release 0.5.7.Herbert Xu


2011-07-08[EVAL] Avoid using undefined handlerJim Meyering

* src/eval.c (evalbltin, evalfun): Set savehandler before calling
setjmp with the possible "goto *done", where savehandler is used.
Otherwise, clang warns that "Assigned value is garbage or undefined"
at the point where "savehandler" is used on the RHS.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2011-07-08[MEMALLOC] Avoid clang warning about dead store to "size"Jim Meyering

* src/memalloc.c (makestrspace): Remove dead store.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>



2011-07-08[MEMALLOC] Avoid gcc warning: variable 'oldstackp' set but not used