mplayerd/mplayerd.patch

   1 --- Makefile    2004-04-29 17:48:31.000000000 +0100
   2 +++ Makefile.ky    2008-12-02 09:22:27.025165240 +0000
   3 @@ -1,10 +1,13 @@
   4 +DESTDIR = .
   5 +prefix = $(DESTDIR)/usr
   6 +
   7  CC=gcc
   8  BINARY=mplayerd
   9
  10  CFLAGS=-Iinc -g -DDEBUG -Wall
  11
  12  MPLAYERD_OBJS=client_request.o ll.o mplayer_command.o mplayer_slave.o fileops.o client.o parse_config.o history.o xmemory.o debug.o tab_comp.o instance.o
  13 -MPLAYERD_CFLAGS=
  14 +MPLAYERD_CFLAGS=$(CFLAGS)
  15  MPLAYERD_LIBS=-lpthread
  16
  17  all: mplayerd
  18 @@ -17,8 +20,11 @@
  19         >valgrind.log
  20
  21  install: all install_complete_message
  22 -       install -m 0555 ${BINARY} /usr/local/bin/
  23 -       install -m 0555 ../mplayerd.1 /usr/local/man/man1/mplayerd.1
  24 +       install -d $(DESTDIR)/etc
  25 +       install -d $(prefix)/{etc,bin/,man/man1/}
  26 +       install -m0755 ${BINARY} $(prefix)/bin/${BINARY}
  27 +       install -m0755 ../mplayerd.1 $(prefix)/man/man1/mplayerd.1
  28 +       install -m0644 ../mplayerd.conf $(DESTDIR)/etc/mplayerd.conf
  29
  30  build: clean all
  31
  32 @@ -26,8 +32,6 @@
  33         @echo -e "!!\r\n!!\r\n!!\tPlease report bugs to mplayerd-bugs@signuts.net"
  34         @echo -e "!!\r\n!!\tLinking mplayerd..."
  35         @echo -e "!!\r\n"
  36 -       @echo -e "!!Do a 'make install_config' or just copy the config file"
  37 -       @echo -e "!!\r\n"
  38
  39  install_complete_message:
  40         @echo -e "!!\r\n!!\tBe sure to edit /etc/mplayerd.conf, consult the README"
  41 @@ -35,7 +39,4 @@
  42         @echo -e "!!\r\n"
  43
  44  uninstall:
  45 -       rm -f /usr/local/bin/mplayerd
  46 -
  47 -install_config:
  48 -       install -m 0555 ../mplayerd.conf /etc/mplayerd.conf
  49 +       rm -f $(prefix)/bin/mplayerd
  50 --- inc/config.h    2004-04-29 17:48:31.000000000 +0100
  51 +++ inc/config.h.ky    2008-12-02 09:13:13.406045640 +0000
  52 @@ -30,6 +30,8 @@
  53  #ifndef HAVE_CONFIG_H
  54  #define HAVE_CONFIG_H
  55
  56 +#include <linux/limits.h>
  57 +
  58  #include "mplayerd-version.h"
  59
  60  /* tab completion */