bftpd/trunk/bftpd-4.9-Makefile.patch

   1 From 5301e7349ba4d1c3f3808829947dab8ee2ac73b0 Mon Sep 17 00:00:00 2001
   2 From: anthraxx <levente@leventepolyak.net>
   3 Date: Wed, 21 Mar 2018 02:12:52 +0100
   4 Subject: [PATCH] make: unfuck paths, flags and modes
   5
   6 ---
   7  Makefile.in | 18 +++++++++---------
   8  1 file changed, 9 insertions(+), 9 deletions(-)
   9
  10 diff --git a/Makefile.in b/Makefile.in
  11 index 6d6ee03..e931934 100644
  12 --- a/Makefile.in
  13 +++ b/Makefile.in
  14 @@ -3,6 +3,6 @@ CC?=@CC@
  15  INSTALL=@INSTALL@
  16  prefix=@prefix@
  17 -CFLAGS=@CFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DPREFIX=\"$(prefix)\" @DEBUG@
  18 +CFLAGS=@CFLAGS@ @CPPFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DPREFIX=\"$(prefix)\" @DEBUG@
  19  LIBS=@LIBS@
  20  mandir=@mandir@
  21  sbindir=@sbindir@
  22 @@ -15,7 +15,7 @@ OBJS=bftpdutmp.o commands.o commands_admin.o cwd.o dirlist.o list.o login.o logg
  23  SRCS=bftpdutmp.c commands.c commands_admin.c cwd.c dirlist.c list.c login.c logging.c main.c mystring.c options.c md5.c
  24
  25  OBJS2LINK=$(OBJS) $(PAX)
  26 -LDFLAGS=
  27 +LDFLAGS?=@LDFLAGS@
  28
  29  all: bftpd
  30
  31 @@ -26,13 +26,13 @@ bftpd: $(OBJS)
  32  $(OBJS): $(HEADERS) Makefile
  33
  34  install: all
  35 -       mkdir -p $(DESTDIR)/$(prefix)/sbin
  36 -       $(INSTALL) -g 0 -m 700 -o 0 bftpd $(DESTDIR)/$(prefix)/sbin
  37 +       mkdir -p $(DESTDIR)/$(sbindir)
  38 +       $(INSTALL) -g 0 -m 755 -o 0 bftpd $(DESTDIR)/$(sbindir)
  39         mkdir -p $(DESTDIR)/$(mandir)/man8
  40         $(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8
  41 -       mkdir -p $(DESTDIR)/$(prefix)/etc
  42 -       [ -f $(DESTDIR)/$(prefix)/etc/bftpd.conf ] || \
  43 -               $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/$(prefix)/etc
  44 +       mkdir -p $(DESTDIR)/etc
  45 +       [ -f $(DESTDIR)/etc/bftpd.conf ] || \
  46 +               $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/etc
  47         mkdir -p $(DESTDIR)/$(prefix)/var/log
  48         touch $(DESTDIR)/$(prefix)/var/log/bftpd.log
  49         chmod 644 $(DESTDIR)/$(prefix)/var/log/bftpd.log
  50 @@ -49,8 +49,8 @@ newversion: clean
  51         ./configure --enable-pax=pax --enable-libz --enable-pam
  52
  53  uninstall:
  54 -       rm -f $(DESTDIR)/$(prefix)/sbin/bftpd $(DESTDIR)/$(mandir)/man8/bftpd.8 \
  55 -               $(DESTDIR)/$(prefix)/etc/bftpd.conf
  56 +       rm -f $(DESTDIR)/$(sbindir)/bftpd $(DESTDIR)/$(mandir)/man8/bftpd.8 \
  57 +               $(DESTDIR)/etc/bftpd.conf
  58
  59  distribute: install
  60         rm -rf dist
  61 --
  62 2.16.2
  63