[Git][debian-proftpd-team/proftpd-mod-vroot][master] Move Make.rules from patches/01_built_outside_tree to subdir debian/ .

[Hilmar Preuße (@hilmar)]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd-mod-vroot


Commits:
e5f8ba67 by Hilmar Preuße at 2025-11-21T23:38:24+01:00
Move Make.rules from patches/01_built_outside_tree to subdir debian/ .

- - - - -


2 changed files:

- + debian/Make.rules
- debian/patches/01_built_outside_tree


Changes:

=====================================
debian/Make.rules
=====================================
@@ -0,0 +1,54 @@
+# This file has been copied from proftp build dir after running configure.
+# It contains some variables needed to build the module; it is read by the
+# top-level Makefile. There is probably still surplus stuff in it.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=${exec_prefix}/bin
+datadir=${datarootdir}
+libdir=${prefix}/lib/x86_64-linux-gnu
+datarootdir=${prefix}/share
+sbindir=${exec_prefix}/sbin
+sysconfdir=/etc/proftpd
+includedir=${prefix}/include
+libexecdir=/usr/lib/proftpd
+localedir=${datarootdir}/locale
+localstatedir=/run
+pkgconfigdir=${prefix}/lib/x86_64-linux-gnu/pkgconfig
+mandir=/usr/share/man
+
+AR=ar
+CC=gcc
+PLATFORM=-DLINUX
+LIBEXECDIR=/usr/lib/proftpd
+LIBTOOL=libtool
+MAKEDEPEND=makedepend -Y
+RANLIB=ranlib
+
+INSTALL=/usr/bin/install -c
+INSTALL_STRIP=
+INSTALL_USER=root
+INSTALL_GROUP=root
+INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
+INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
+
+RM=rm -f
+SHELL=/bin/bash
+
+ENABLE_NLS=1
+ENABLE_TESTS=""
+
+# Directory include paths.
+#
+INCLUDES=-I.. -I$(top_srcdir)/include -I$(top_builddir)/include -I/usr/include/proftpd
+
+# Preprocessor compilation flags.
+#
+ADDL_CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
+
+# Our additional compiler flags.
+#
+CFLAGS=-Wall -fno-omit-frame-pointer
+CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
+DEFINES=$(PLATFORM)


=====================================
debian/patches/01_built_outside_tree
=====================================
@@ -1,58 +1,5 @@
 Required changes to build module outside of proftp source tree.
 
---- /dev/null
-+++ proftpd-mod-vroot/Make.rules
-@@ -0,0 +1,50 @@
-+prefix=/usr
-+exec_prefix=/usr
-+bindir=${exec_prefix}/bin
-+datadir=${datarootdir}
-+libdir=${prefix}/lib/x86_64-linux-gnu
-+datarootdir=${prefix}/share
-+sbindir=${exec_prefix}/sbin
-+sysconfdir=/etc/proftpd
-+includedir=${prefix}/include
-+libexecdir=/usr/lib/proftpd
-+localedir=${datarootdir}/locale
-+localstatedir=/run
-+pkgconfigdir=${prefix}/lib/x86_64-linux-gnu/pkgconfig
-+mandir=/usr/share/man
-+
-+AR=ar
-+CC=gcc
-+PLATFORM=-DLINUX
-+LIBEXECDIR=/usr/lib/proftpd
-+LIBTOOL=libtool
-+MAKEDEPEND=makedepend -Y
-+RANLIB=ranlib
-+
-+INSTALL=/usr/bin/install -c
-+INSTALL_STRIP=
-+INSTALL_USER=root
-+INSTALL_GROUP=root
-+INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
-+INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
-+INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
-+
-+RM=rm -f
-+SHELL=/bin/bash
-+
-+ENABLE_NLS=1
-+ENABLE_TESTS=""
-+
-+# Directory include paths.
-+#
-+INCLUDES=-I.. -I$(top_srcdir)/include -I$(top_builddir)/include -I/usr/include/proftpd
-+
-+# Preprocessor compilation flags.
-+#
-+ADDL_CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
-+
-+# Our additional compiler flags.
-+#
-+CFLAGS=-Wall -fno-omit-frame-pointer
-+CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
-+DEFINES=$(PLATFORM)
 --- proftpd-mod-vroot.orig/Makefile.in
 +++ proftpd-mod-vroot/Makefile.in
 @@ -2,12 +2,13 @@
@@ -60,7 +7,7 @@ Required changes to build module outside of proftp source tree.
  srcdir=@srcdir@
  
 -include $(top_srcdir)/Make.rules
-+include Make.rules
++include debian/Make.rules
  
  .SUFFIXES: .la .lo
  



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-vroot/-/commit/e5f8ba6710b46c05db352de6ab373561d251ed8f

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd-mod-vroot/-/commit/e5f8ba6710b46c05db352de6ab373561d251ed8f
You're receiving this email because of your account on salsa.debian.org.