Commit 54a8ec88 authored by Ivica Bukvic's avatar Ivica Bukvic
Browse files

fixed regression with the previous commit dealing with pd~ not working.

parent bf899adb
......@@ -178,13 +178,13 @@ static void pd_tilde_donew(t_pd_tilde *x, char *pddir, char *schedlibdir,
struct stat statbuf;
x->x_infd = x->x_outfd = 0;
x->x_childpid = -1;
snprintf(pdexecbuf, MAXPDSTRING, "%s/bin/pd", pddir);
snprintf(pdexecbuf, MAXPDSTRING, "%s/bin/pd-l2ork", pddir);
if (stat(pdexecbuf, &statbuf) < 0)
{
snprintf(pdexecbuf, MAXPDSTRING, "%s/../../../bin/pd", pddir);
snprintf(pdexecbuf, MAXPDSTRING, "%s/../../../bin/pd-l2ork", pddir);
if (stat(pdexecbuf, &statbuf) < 0)
{
snprintf(pdexecbuf, MAXPDSTRING, "%s/pd", pddir);
snprintf(pdexecbuf, MAXPDSTRING, "%s/pd-l2ork", pddir);
if (stat(pdexecbuf, &statbuf) < 0)
{
ERROR "pd~: can't stat %s", pdexecbuf);
......
......@@ -203,7 +203,7 @@ install: all
install $(BINARYMODE) $(PDEXEC) $(DESTDIR)$(bindir)/@PDEXEC@
# kludge to allow pd~ to work by default in pd-l2ork
rm -f $(DESTDIR)$(libpddir)/pd
ln -s $(bindir)/pd-l2ork $(DESTDIR)$(libpddir)/pd
#ln -s $(bindir)/pd-l2ork $(DESTDIR)$(libpddir)/bin/pd
install -m755 $(BIN_DIR)/pdsend $(DESTDIR)$(bindir)/pdsend
install -m755 $(BIN_DIR)/pdreceive $(DESTDIR)$(bindir)/pdreceive
for dir in $(shell ls -1 ../doc | grep -v CVS); do \
......
......@@ -459,14 +459,6 @@ void sys_findprogdir(char *progname)
/* go back to the parent from there, e.g., ~/pd */
lastslash = strrchr(sbuf, '/');
if (lastslash)
{
strncpy(sbuf2, sbuf, lastslash-sbuf);
sbuf2[lastslash-sbuf] = 0;
}
/* go back to the parent from there once more, e.g., ~/pd */
strcpy(sbuf, sbuf2);
lastslash = strrchr(sbuf, '/');
if (lastslash)
{
strncpy(sbuf2, sbuf, lastslash-sbuf);
sbuf2[lastslash-sbuf] = 0;
......
Supports Markdown
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