80 lines
2.1 KiB
Diff
80 lines
2.1 KiB
Diff
|
From: Alexey Svistunov <svalx@svalx.net>
|
||
|
|
Date: 2017-03-21 12:22:00 +0300
|
||
|
|
Subject: Independent rmt and ermt build, change its locations to _bindir
|
||
|
|
References:
|
||
|
|
Upstream: submitted
|
||
|
|
|
||
|
|
|
||
|
|
Index: dump-0.4b46/rmt/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- dump-0.4b46.orig/rmt/Makefile.am
|
||
|
|
+++ dump-0.4b46/rmt/Makefile.am
|
||
|
|
@@ -1,17 +1,23 @@
|
||
|
|
AM_CPPFLAGS = -I$(top_srcdir)/compat/include
|
||
|
|
DISTCLEANFILES =
|
||
|
|
EXTRA_DIST =
|
||
|
|
+bin_PROGRAMS =
|
||
|
|
+man_MANS =
|
||
|
|
|
||
|
|
-sbin_PROGRAMS = rmt
|
||
|
|
+if BUILD_RMT
|
||
|
|
+bin_PROGRAMS += rmt
|
||
|
|
+man_MANS += rmt.8
|
||
|
|
+DISTCLEANFILES += rmt.8
|
||
|
|
+EXTRA_DIST += rmt.8.in
|
||
|
|
+endif
|
||
|
|
|
||
|
|
if BUILD_ERMT
|
||
|
|
-sbin_PROGRAMS += ermt
|
||
|
|
+bin_PROGRAMS += ermt
|
||
|
|
+man_MANS += ermt.1
|
||
|
|
+DISTCLEANFILES += ermt.1
|
||
|
|
+EXTRA_DIST += ermt.1.in
|
||
|
|
endif
|
||
|
|
|
||
|
|
-man_MANS = rmt.8
|
||
|
|
-DISTCLEANFILES += rmt.8
|
||
|
|
-EXTRA_DIST += rmt.8.in
|
||
|
|
-
|
||
|
|
rmt_SOURCES = rmt.c
|
||
|
|
rmt_LDADD = ../compat/lib/libcompat.la $(EXT2FS_LIBS)
|
||
|
|
|
||
|
|
@@ -22,3 +28,8 @@ rmt.8: rmt.8.in
|
||
|
|
$(AM_V_GEN)\
|
||
|
|
sed -e "s|__DATE__|$(DATE)|g" \
|
||
|
|
-e "s|__VERSION__|$(VERSION)|g" $< > $@
|
||
|
|
+ermt.1: ermt.1.in
|
||
|
|
+ $(AM_V_GEN)\
|
||
|
|
+ sed -e "s|__DATE__|$(DATE)|g" \
|
||
|
|
+ -e "s|__VERSION__|$(VERSION)|g" $< > $@
|
||
|
|
+
|
||
|
|
Index: dump-0.4b46/configure.ac
|
||
|
|
===================================================================
|
||
|
|
--- dump-0.4b46.orig/configure.ac
|
||
|
|
+++ dump-0.4b46/configure.ac
|
||
|
|
@@ -80,9 +80,6 @@ AC_MSG_CHECKING([whether to build ermt])
|
||
|
|
BUILD_ERMT=no
|
||
|
|
AC_ARG_ENABLE([ermt], [AC_HELP_STRING([--enable-ermt], [compile ermt, an encrypting version of rmt @<:@default=no@:>@])])
|
||
|
|
if test "$enable_ermt" = "yes"; then
|
||
|
|
- if test "$BUILD_RMT" != "yes"; then
|
||
|
|
- AC_MSG_ERROR([ermt requires --enable-rmt])
|
||
|
|
- fi
|
||
|
|
BUILD_ERMT=yes
|
||
|
|
fi
|
||
|
|
AM_CONDITIONAL([BUILD_ERMT], [test "$BUILD_ERMT" = "yes"])
|
||
|
|
Index: dump-0.4b46/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- dump-0.4b46.orig/Makefile.am
|
||
|
|
+++ dump-0.4b46/Makefile.am
|
||
|
|
@@ -1,9 +1,6 @@
|
||
|
|
ACLOCAL_AMFLAGS = -I m4
|
||
|
|
|
||
|
|
-SUBDIRS = compat/lib common dump restore
|
||
|
|
-if BUILD_RMT
|
||
|
|
-SUBDIRS += rmt
|
||
|
|
-endif
|
||
|
|
+SUBDIRS = compat/lib common dump restore rmt
|
||
|
|
|
||
|
|
EXTRA_DIST = \
|
||
|
|
dump.lsm KNOWNBUGS MAINTAINERS REPORTING-BUGS \
|