Commit 596ee7e0 authored by Jared Mauch's avatar Jared Mauch
Browse files

Merge branch 'master' into 'master'

Support DESTROOT and build on Mac OS X

See merge request !1
parents fa50d657 c97069d0
...@@ -54,13 +54,13 @@ register: ...@@ -54,13 +54,13 @@ register:
grep SYSM_VERS config.h | mail -s"Sysmon Registration" grep SYSM_VERS config.h | mail -s"Sysmon Registration"
install: all install: all
@echo "installing into @bindir@" @echo "installing into $(DESTROOT)@bindir@"
-mkdir -p @bindir@ -mkdir -p $(DESTROOT)@bindir@
-mv @bindir@/sysmond @bindir@/sysmond.old -mv $(DESTROOT)@bindir@/sysmond $(DESTROOT)@bindir@/sysmond.old
-mv @bindir@/sysmon @bindir@/sysmon.old -mv $(DESTROOT)@bindir@/sysmon $(DESTROOT)@bindir@/sysmon.old
cp sysmon sysmond @bindir@ cp sysmon sysmond $(DESTROOT)@bindir@
@echo "creating directory @sysconfdir@" @echo "creating directory $(DESTROOT)@sysconfdir@"
-mkdir -p @sysconfdir@ -mkdir -p $(DESTROOT)@sysconfdir@
strip: strip:
-strip @PROGS@ -strip @PROGS@
...@@ -391,7 +391,7 @@ void do_ack(struct clientstatus *client, char *buff) ...@@ -391,7 +391,7 @@ void do_ack(struct clientstatus *client, char *buff)
if (client->authlvl <= 0) if (client->authlvl <= 0)
{ {
sendline(client->filedes, "444 Permission Denied"); sendline(client->filedes, "444 Permission Denied");
return 0; return;
} }
strncpy(objname, buff+4, 127); strncpy(objname, buff+4, 127);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment