altomaltes / cross / slibtool

Forked from cross/slibtool 3 years ago
Clone
Source Code
GIT

aacf07 build system: added extended dir variables.

Authored and Committed by midipix 7 years ago
raw patch tree parent
3 files changed. 140 lines added. 0 lines removed.
Makefile.in
file modified
+29 -0
config.usage
file modified
+27 -0
configure
file modified
+84 -0 
    build system: added extended dir variables.
file modified
+29 -0
Makefile.in CHANGED
@@ -54,10 +54,24 @@ BINDIR = @bindir@
54
54
SBINDIR = @sbindir@
55
55
LIBDIR = @libdir@
56
56
INCLUDEDIR = @includedir@
57
+ OLDINCLUDEDIR = @oldincludedir@
57
58
MANDIR = @mandir@
58
59
DOCDIR = @docdir@
59
60
LIBEXECDIR = @libexecdir@
60
61
62
+ SYSCONFDIR = @sysconfdir@
63
+ SHAREDSTATEDIR = @sharedstatedir@
64
+ LOCALSTATEDIR = @localstatedir@
65
+ RUNSTATEDIR = @runstatedir@
66
+ DATAROOTDIR = @datarootdir@
67
+ DATADIR = @datadir@
68
+ INFODIR = @infodir@
69
+ LOCALEDIR = @localedir@
70
+ HTMLDIR = @htmldir@
71
+ DVIDIR = @dvidir@
72
+ PDFDIR = @pdfdir@
73
+ PSDIR = @psdir@
74
+
61
75
NATIVE_CC = @native_cc@
62
76
NATIVE_OS = @native_os@
63
77
NATIVE_OS_BITS = @native_os_bits@
@@ -347,11 +361,26 @@ clean: clean-implib
347
361
@echo SBINDIR:' '$(SBINDIR)
348
362
@echo LIBDIR:' '$(LIBDIR)
349
363
@echo INCLUDEDIR:' '$(INCLUDEDIR)
364
+ @echo OLDINCLUDEDIR:' '$(OLDINCLUDEDIR)
350
365
@echo MANDIR:' '$(MANDIR)
351
366
@echo DOCDIR:' '$(DOCDIR)
352
367
@echo LIBEXECDIR:' '$(LIBEXECDIR)
353
368
@echo
354
369
370
+ .display-exdirs:
371
+ @echo SYSCONFDIR' '$(SYSCONFDIR)
372
+ @echo SHAREDSTATEDIR' '$(SHAREDSTATEDIR)
373
+ @echo LOCALSTATEDIR' '$(LOCALSTATEDIR)
374
+ @echo RUNSTATEDIR' '$(RUNSTATEDIR)
375
+ @echo DATAROOTDIR' '$(DATAROOTDIR)
376
+ @echo DATADIR' '$(DATADIR)
377
+ @echo INFODIR' '$(INFODIR)
378
+ @echo LOCALEDIR' '$(LOCALEDIR)
379
+ @echo HTMLDIR' '$(HTMLDIR)
380
+ @echo DVIDIR' '$(DVIDIR)
381
+ @echo PDFDIR' '$(PDFDIR)
382
+ @echo PSDIR' '$(PSDIR)
383
+
355
384
.display-build:
356
385
@echo NATIVE_CC:' '$(NATIVE_CC)
357
386
@echo NATIVE_OS:' '$(NATIVE_OS)
file modified
+27 -0
config.usage CHANGED
@@ -14,10 +14,24 @@ supported switches:
14
14
--sbindir
15
15
--libdir
16
16
--includedir
17
+ --oldincludedir
17
18
--mandir
18
19
--docdir
19
20
--libexecdir
20
21
22
+ --sysconfdir
23
+ --sharedstatedir
24
+ --localstatedir
25
+ --runstatedir
26
+ --datarootdir
27
+ --datadir
28
+ --infodir
29
+ --localedir
30
+ --htmldir
31
+ --dvidir
32
+ --pdfdir
33
+ --psdir
34
+
21
35
--build
22
36
--host
23
37
--target
@@ -61,6 +75,19 @@ supported variables:
61
75
DOCDIR
62
76
LIBEXECDIR
63
77
78
+ SYSCONFDIR
79
+ SHAREDSTATEDIR
80
+ LOCALSTATEDIR
81
+ RUNSTATEDIR
82
+ DATAROOTDIR
83
+ DATADIR
84
+ INFODIR
85
+ LOCALEDIR
86
+ HTMLDIR
87
+ DVIDIR
88
+ PDFDIR
89
+ PSDIR
90
+
64
91
CC
65
92
CPP
66
93
CXX
file modified
+84 -0
configure CHANGED
@@ -44,10 +44,24 @@ init_vars()
44
44
mb_sbindir=$SBINDIR
45
45
mb_libdir=$LIBDIR
46
46
mb_includedir=$INCLUDEDIR
47
+ mb_oldincludedir=$OLDINCLUDEDIR
47
48
mb_mandir=$MANDIR
48
49
mb_docdir=$DOCDIR
49
50
mb_libexecdir=$LIBEXECDIR
50
51
52
+ mb_sysconfdir=$SYSCONFDIR
53
+ mb_sharedstatedir=$SHAREDSTATEDIR
54
+ mb_localstatedir=$LOCALSTATEDIR
55
+ mb_runstatedir=$RUNSTATEDIR
56
+ mb_datarootdir=$DATAROOTDIR
57
+ mb_datadir=$DATADIR
58
+ mb_infodir=$INFODIR
59
+ mb_localedir=$LOCALEDIR
60
+ mb_htmldir=$HTMLDIR
61
+ mb_dvidir=$DVIDIR
62
+ mb_pdfdir=$PDFDIR
63
+ mb_psdir=$PSDIR
64
+
51
65
52
66
# build
53
67
mb_build=$BUILD
@@ -161,11 +175,26 @@ common_defaults()
161
175
[ -z "$mb_sbindir" ] && mb_sbindir=$mb_exec_prefix/sbin
162
176
[ -z "$mb_libdir" ] && mb_libdir=$mb_exec_prefix/lib
163
177
[ -z "$mb_includedir" ] && mb_includedir=$mb_prefix/include
178
+ [ -z "$mb_oldincludedir" ] && mb_oldincludedir=$mb_prefix/include
164
179
[ -z "$mb_datarootdir" ] && mb_datarootdir=$mb_prefix/share
165
180
[ -z "$mb_mandir" ] && mb_mandir=$mb_datarootdir/man
166
181
[ -z "$mb_docdir" ] && mb_docdir=$mb_datarootdir/doc
167
182
[ -z "$mb_libexecdir" ] && mb_libexecdir=$mb_exec_prefix/libexec
168
183
184
+ [ -z "$mb_sysconfdir" ] && mb_sysconfdir=$mb_exec_prefix/etc
185
+ [ -z "$mb_sharedstatedir" ] && mb_sharedstatedir=$mb_prefix/com
186
+ [ -z "$mb_localstatedir" ] && mb_localstatedir=$mb_prefix/var
187
+ [ -z "$mb_runstatedir" ] && mb_runstatedir=$mb_localstatedir/run
188
+ [ -z "$mb_datarootdir" ] && mb_datarootdir=$mb_prefix/share
189
+ [ -z "$mb_datadir" ] && mb_datadir=$mb_datarootdir
190
+ [ -z "$mb_infodir" ] && mb_infodir=$mb_datarootdir/info
191
+ [ -z "$mb_localedir" ] && mb_localedir=$mb_datarootdir/locale
192
+ [ -z "$mb_htmldir" ] && mb_htmldir=$mb_docdir
193
+ [ -z "$mb_dvidir" ] && mb_dvidir=$mb_docdir
194
+ [ -z "$mb_pdfdir" ] && mb_pdfdir=$mb_docdir
195
+ [ -z "$mb_psdir" ] && mb_psdir=$mb_docdir
196
+
197
+
169
198
# build
170
199
[ -z "$mb_build" ] && mb_build=$mb_default_build
171
200
[ -z "$mb_host" ] && mb_host=$mb_default_host
@@ -453,10 +482,24 @@ config_copy()
453
482
-e 's^@sbindir@^'"$mb_sbindir"'^g' \
454
483
-e 's^@libdir@^'"$mb_libdir"'^g' \
455
484
-e 's^@includedir@^'"$mb_includedir"'^g' \
485
+ -e 's^@oldincludedir@^'"$mb_oldincludedir"'^g' \
456
486
-e 's^@mandir@^'"$mb_mandir"'^g' \
457
487
-e 's^@docdir@^'"$mb_docdir"'^g' \
458
488
-e 's^@libexecdir@^'"$mb_libexecdir"'^g' \
459
489
\
490
+ -e 's^@sysconfdir@^'"$mb_sysconfdir"'^g' \
491
+ -e 's^@sharedstatedir@^'"$mb_sharedstatedir"'^g' \
492
+ -e 's^@localstatedir@^'"$mb_localstatedir"'^g' \
493
+ -e 's^@runstatedir@^'"$mb_runstatedir"'^g' \
494
+ -e 's^@datarootdir@^'"$mb_datarootdir"'^g' \
495
+ -e 's^@datadir@^'"$mb_datadir"'^g' \
496
+ -e 's^@infodir@^'"$mb_infodir"'^g' \
497
+ -e 's^@localedir@^'"$mb_localedir"'^g' \
498
+ -e 's^@htmldir@^'"$mb_htmldir"'^g' \
499
+ -e 's^@dvidir@^'"$mb_dvidir"'^g' \
500
+ -e 's^@pdfdir@^'"$mb_pdfdir"'^g' \
501
+ -e 's^@psdir@^'"$mb_psdir"'^g' \
502
+ \
460
503
-e 's^@native_cc@^'"$mb_native_cc"'^g' \
461
504
-e 's^@native_os@^'"$mb_native_os"'^g' \
462
505
-e 's^@native_os_bits@^'"$mb_native_os_bits"'^g' \
@@ -546,6 +589,9 @@ for arg ; do
546
589
--includedir=*)
547
590
mb_includedir=${arg#*=}
548
591
;;
592
+ --oldincludedir=*)
593
+ mb_oldincludedir=${arg#*=}
594
+ ;;
549
595
--mandir=*)
550
596
mb_mandir=${arg#*=}
551
597
;;
@@ -554,6 +600,44 @@ for arg ; do
554
600
;;
555
601
556
602
603
+ --sysconfdir=*)
604
+ mb_sysconfdir=${arg#*=}
605
+ ;;
606
+ --sharedstatedir=*)
607
+ mb_sharedstatedir=${arg#*=}
608
+ ;;
609
+ --localstatedir=*)
610
+ mb_localstatedir=${arg#*=}
611
+ ;;
612
+ --runstatedir=*)
613
+ mb_runstatedir=${arg#*=}
614
+ ;;
615
+ --datarootdir=*)
616
+ mb_datarootdir=${arg#*=}
617
+ ;;
618
+ --datadir=*)
619
+ mb_datadir=${arg#*=}
620
+ ;;
621
+ --infodir=*)
622
+ mb_infodir=${arg#*=}
623
+ ;;
624
+ --localedir=*)
625
+ mb_localedir=${arg#*=}
626
+ ;;
627
+ --htmldir=*)
628
+ mb_htmldir=${arg#*=}
629
+ ;;
630
+ --dvidir=*)
631
+ mb_dvidir=${arg#*=}
632
+ ;;
633
+ --pdfdir=*)
634
+ mb_pdfdir=${arg#*=}
635
+ ;;
636
+ --psdir=*)
637
+ mb_psdir=${arg#*=}
638
+ ;;
639
+
640
+
557
641
# build
558
642
--build=*)
559
643
mb_build=${arg#*=}

Powered by Pagure 5.13.3

SSH Hostkey/Fingerprint | Documentation | About

© Red Hat, Inc. and others.