1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
diff -ru a/configure b/configure
--- a/configure 2018-01-20 00:27:18.000000000 +0000
+++ b/configure 2019-08-19 14:51:02.694029707 +0000
@@ -6317,7 +6317,7 @@
fi
cf_cv_rm_so_locs=yes
;;
- (linux*|gnu*|k*bsd*-gnu)
+ (linux*|gnu*|k*bsd*-gnu|midipix*)
if test "$DFT_LWR_MODEL" = "shared" ; then
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
diff -ru a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
--- a/misc/gen-pkgconfig.in 2018-01-01 22:51:23.000000000 +0000
+++ b/misc/gen-pkgconfig.in 2019-08-19 14:51:02.694029707 +0000
@@ -64,17 +64,7 @@
MENU_LIBRARY="${MENU_NAME}@USE_ARG_SUFFIX@"
FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@"
-CFLAGS="@PKG_CFLAGS@"
-if test "$includedir" != "/usr/include" ; then
- includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
- test "$includetop" = "/usr/include" && includetop="$includedir"
- if test "x$includetop" != "x$includedir"
- then
- CFLAGS="$CFLAGS -I${includetop}"
- fi
- CFLAGS="$CFLAGS -I\${includedir}"
-fi
-
+CFLAGS='-I${includedir}'
LDFLAGS=
if test "$libdir" != "/usr/lib" ; then
LDFLAGS="$LDFLAGS -L\${libdir}"
--- ncurses-6.1/misc/run_tic.in.orig 2017-10-24 00:16:22.000000000 +0000
+++ ncurses-6.1/misc/run_tic.in 2019-10-11 16:25:12.380000000 +0000
@@ -42,16 +42,8 @@
# make install.data
: ${suffix:=@EXEEXT@}
-: ${DESTDIR:=@DESTDIR@}
-: ${prefix:=@prefix@}
-: ${exec_prefix:=@exec_prefix@}
-: ${bindir:=@bindir@}
-: ${top_srcdir:=@top_srcdir@}
-: ${srcdir:=@srcdir@}
: ${datarootdir:=@datarootdir@}
-: ${datadir:=@datadir@}
: ${TIC_PATH:=@TIC_PATH@}
-: ${ticdir:=@TERMINFO@}
: ${source:=@TERMINFO_SRC@}
: ${LN_S:="@LN_S@"}
: ${cross_compiling:=no}
--- ncurses-6.1/misc/Makefile.in.orig 2017-12-31 20:34:42.000000000 +0000
+++ ncurses-6.1/misc/Makefile.in 2019-10-11 16:27:12.376000000 +0000
@@ -83,17 +83,17 @@
install : @MISC_INSTALL_DATA@ install.libs
install.data : terminfo.tmp \
- $(DESTDIR)$(libdir) \
- $(DESTDIR)$(datadir) \
- $(DESTDIR)$(tabsetdir)
+ $(DESTDIR)/lib \
+ $(DESTDIR)/share \
+ $(DESTDIR)/share/tabset
DESTDIR=${DESTDIR} \
- prefix=${prefix} \
- exec_prefix=${exec_prefix} \
- bindir=${bindir} \
+ prefix="" \
+ exec_prefix="" \
+ bindir=bin \
top_srcdir=${top_srcdir} \
srcdir=${srcdir} \
- datadir=${datadir} \
- ticdir=${ticdir} \
+ datadir=share \
+ ticdir=share/terminfo \
source=terminfo.tmp \
cross_compiling=@cross_compiling@ \
$(SHELL) ./run_tic.sh
@@ -101,7 +101,7 @@
$(SHELL) -c 'for i in * ; do \
if test -f $$i ; then \
echo installing $$i; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(tabsetdir)/$$i; \
+ $(INSTALL_DATA) $$i $(DESTDIR)/share/tabset/$$i; \
fi; done'
NCURSES_CONFIG = ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@@cf_config_suffix@-config
@@ -113,12 +113,12 @@
# pkg-config is not installed. Work around that by creating the library
# directory during this rule:
@MAKE_PC_FILES@install.libs :: pc-files
-@MAKE_PC_FILES@ @$(SHELL) -c 'case "x$(DESTDIR)$(PKG_CONFIG_LIBDIR)" in \
+@MAKE_PC_FILES@ @$(SHELL) -c 'case "x$(PKG_CONFIG_LIBDIR)" in \
@MAKE_PC_FILES@ (x/*) \
-@MAKE_PC_FILES@ mkdir -p $(DESTDIR)$(PKG_CONFIG_LIBDIR); \
+@MAKE_PC_FILES@ mkdir -p $(PKG_CONFIG_LIBDIR); \
@MAKE_PC_FILES@ for name in *.pc; do \
@MAKE_PC_FILES@ echo installing $$name; \
-@MAKE_PC_FILES@ $(INSTALL_DATA) $$name $(DESTDIR)$(PKG_CONFIG_LIBDIR)/$$name; \
+@MAKE_PC_FILES@ $(INSTALL_DATA) $$name $(PKG_CONFIG_LIBDIR)/$$name; \
@MAKE_PC_FILES@ done \
@MAKE_PC_FILES@ ;; \
@MAKE_PC_FILES@ (*) \
diff -ru a/misc/ncurses-config.in b/misc/ncurses-config.in
--- a/misc/ncurses-config.in 2018-01-20 00:27:18.000000000 +0000
+++ b/misc/ncurses-config.in 2020-03-11 15:38:05.000000000 +0000
@@ -111,12 +111,7 @@
;;
--libs)
- if test "$libdir" = /usr/lib
- then
- LIBDIR=
- else
- LIBDIR=-L$libdir
- fi
+ LIBDIR=
if test @TINFO_NAME@ = @LIB_NAME@ ; then
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
|
