Skip to content

Commit e480e8b

Browse files
rfmrfm
authored
Merge pull request #45 from qmfrederik/fixes/libdir
Allow users to override the /lib dir
2 parents 0cf140e + adbab30 commit e480e8b

File tree

4 files changed

+88
-60
lines changed

4 files changed

+88
-60
lines changed

‎FilesystemLayouts/fhs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,38 +31,38 @@ GNUSTEP_LOCAL_USERS_DIR=/home
3131
# paths.
3232
GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles
3333

34-
GNUSTEP_SYSTEM_APPS=/lib/GNUstep/Applications
35-
GNUSTEP_SYSTEM_ADMIN_APPS=/lib/GNUstep/Applications
36-
GNUSTEP_SYSTEM_WEB_APPS=/lib/GNUstep/WebApplications
34+
GNUSTEP_SYSTEM_APPS=/@libdir@/GNUstep/Applications
35+
GNUSTEP_SYSTEM_ADMIN_APPS=/@libdir@/GNUstep/Applications
36+
GNUSTEP_SYSTEM_WEB_APPS=/@libdir@/GNUstep/WebApplications
3737
GNUSTEP_SYSTEM_TOOLS=/bin
3838
GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin
39-
GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep
39+
GNUSTEP_SYSTEM_LIBRARY=/@libdir@/GNUstep
4040
GNUSTEP_SYSTEM_HEADERS=/include
41-
GNUSTEP_SYSTEM_LIBRARIES=/lib
41+
GNUSTEP_SYSTEM_LIBRARIES=/@libdir@
4242
GNUSTEP_SYSTEM_DOC=/share/GNUstep/Documentation
4343
GNUSTEP_SYSTEM_DOC_MAN=/share/man
4444
GNUSTEP_SYSTEM_DOC_INFO=/share/info
4545

46-
GNUSTEP_NETWORK_APPS=/lib/GNUstep/Applications
47-
GNUSTEP_NETWORK_ADMIN_APPS=/lib/GNUstep/Applications
48-
GNUSTEP_NETWORK_WEB_APPS=/lib/GNUstep/WebApplications
46+
GNUSTEP_NETWORK_APPS=/@libdir@/GNUstep/Applications
47+
GNUSTEP_NETWORK_ADMIN_APPS=/@libdir@/GNUstep/Applications
48+
GNUSTEP_NETWORK_WEB_APPS=/@libdir@/GNUstep/WebApplications
4949
GNUSTEP_NETWORK_TOOLS=/bin
5050
GNUSTEP_NETWORK_ADMIN_TOOLS=/sbin
51-
GNUSTEP_NETWORK_LIBRARY=/lib/GNUstep
51+
GNUSTEP_NETWORK_LIBRARY=/@libdir@/GNUstep
5252
GNUSTEP_NETWORK_HEADERS=/include
53-
GNUSTEP_NETWORK_LIBRARIES=/lib
53+
GNUSTEP_NETWORK_LIBRARIES=/@libdir@
5454
GNUSTEP_NETWORK_DOC=/share/GNUstep/Documentation
5555
GNUSTEP_NETWORK_DOC_MAN=/share/man
5656
GNUSTEP_NETWORK_DOC_INFO=/share/info
5757

58-
GNUSTEP_LOCAL_APPS=/lib/GNUstep/Applications
59-
GNUSTEP_LOCAL_ADMIN_APPS=/lib/GNUstep/Applications
60-
GNUSTEP_LOCAL_WEB_APPS=/lib/GNUstep/WebApplications
58+
GNUSTEP_LOCAL_APPS=/@libdir@/GNUstep/Applications
59+
GNUSTEP_LOCAL_ADMIN_APPS=/@libdir@/GNUstep/Applications
60+
GNUSTEP_LOCAL_WEB_APPS=/@libdir@/GNUstep/WebApplications
6161
GNUSTEP_LOCAL_TOOLS=/bin
6262
GNUSTEP_LOCAL_ADMIN_TOOLS=/sbin
63-
GNUSTEP_LOCAL_LIBRARY=/lib/GNUstep
63+
GNUSTEP_LOCAL_LIBRARY=/@libdir@/GNUstep
6464
GNUSTEP_LOCAL_HEADERS=/include
65-
GNUSTEP_LOCAL_LIBRARIES=/lib
65+
GNUSTEP_LOCAL_LIBRARIES=/@libdir@
6666
GNUSTEP_LOCAL_DOC=/share/GNUstep/Documentation
6767
GNUSTEP_LOCAL_DOC_MAN=/share/man
6868
GNUSTEP_LOCAL_DOC_INFO=/share/info

‎FilesystemLayouts/fhs-system

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,38 +40,38 @@ GNUSTEP_LOCAL_USERS_DIR=/home
4040
# paths.
4141
GNUSTEP_MAKEFILES=/share/GNUstep/Makefiles
4242

43-
GNUSTEP_SYSTEM_APPS=/lib/GNUstep/Applications
44-
GNUSTEP_SYSTEM_ADMIN_APPS=/lib/GNUstep/Applications
45-
GNUSTEP_SYSTEM_WEB_APPS=/lib/GNUstep/WebApplications
43+
GNUSTEP_SYSTEM_APPS=/@libdir@/GNUstep/Applications
44+
GNUSTEP_SYSTEM_ADMIN_APPS=/@libdir@/GNUstep/Applications
45+
GNUSTEP_SYSTEM_WEB_APPS=/@libdir@/GNUstep/WebApplications
4646
GNUSTEP_SYSTEM_TOOLS=/bin
4747
GNUSTEP_SYSTEM_ADMIN_TOOLS=/sbin
48-
GNUSTEP_SYSTEM_LIBRARY=/lib/GNUstep
48+
GNUSTEP_SYSTEM_LIBRARY=/@libdir@/GNUstep
4949
GNUSTEP_SYSTEM_HEADERS=/include
50-
GNUSTEP_SYSTEM_LIBRARIES=/lib
50+
GNUSTEP_SYSTEM_LIBRARIES=/@libdir@
5151
GNUSTEP_SYSTEM_DOC=/share/GNUstep/Documentation
5252
GNUSTEP_SYSTEM_DOC_MAN=/share/man
5353
GNUSTEP_SYSTEM_DOC_INFO=/share/info
5454

55-
GNUSTEP_NETWORK_APPS=/local/lib/GNUstep/Applications
56-
GNUSTEP_NETWORK_ADMIN_APPS=/local/lib/GNUstep/Applications
57-
GNUSTEP_NETWORK_WEB_APPS=/lib/GNUstep/WebApplications
55+
GNUSTEP_NETWORK_APPS=/local/@libdir@/GNUstep/Applications
56+
GNUSTEP_NETWORK_ADMIN_APPS=/local/@libdir@/GNUstep/Applications
57+
GNUSTEP_NETWORK_WEB_APPS=/@libdir@/GNUstep/WebApplications
5858
GNUSTEP_NETWORK_TOOLS=/local/bin
5959
GNUSTEP_NETWORK_ADMIN_TOOLS=/local/sbin
60-
GNUSTEP_NETWORK_LIBRARY=/local/lib/GNUstep
60+
GNUSTEP_NETWORK_LIBRARY=/local/@libdir@/GNUstep
6161
GNUSTEP_NETWORK_HEADERS=/local/include
62-
GNUSTEP_NETWORK_LIBRARIES=/local/lib
62+
GNUSTEP_NETWORK_LIBRARIES=/local/@libdir@
6363
GNUSTEP_NETWORK_DOC=/local/share/GNUstep/Documentation
6464
GNUSTEP_NETWORK_DOC_MAN=/local/share/man
6565
GNUSTEP_NETWORK_DOC_INFO=/local/share/info
6666

67-
GNUSTEP_LOCAL_APPS=/local/lib/GNUstep/Applications
68-
GNUSTEP_LOCAL_ADMIN_APPS=/local/lib/GNUstep/Applications
69-
GNUSTEP_LOCAL_WEB_APPS=/local/lib/GNUstep/WebApplications
67+
GNUSTEP_LOCAL_APPS=/local/@libdir@/GNUstep/Applications
68+
GNUSTEP_LOCAL_ADMIN_APPS=/local/@libdir@/GNUstep/Applications
69+
GNUSTEP_LOCAL_WEB_APPS=/local/@libdir@/GNUstep/WebApplications
7070
GNUSTEP_LOCAL_TOOLS=/local/bin
7171
GNUSTEP_LOCAL_ADMIN_TOOLS=/local/sbin
72-
GNUSTEP_LOCAL_LIBRARY=/local/lib/GNUstep
72+
GNUSTEP_LOCAL_LIBRARY=/local/@libdir@/GNUstep
7373
GNUSTEP_LOCAL_HEADERS=/local/include
74-
GNUSTEP_LOCAL_LIBRARIES=/local/lib
74+
GNUSTEP_LOCAL_LIBRARIES=/local/@libdir@
7575
GNUSTEP_LOCAL_DOC=/local/share/GNUstep/Documentation
7676
GNUSTEP_LOCAL_DOC_MAN=/local/share/man
7777
GNUSTEP_LOCAL_DOC_INFO=/local/share/info

‎configure

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,7 @@ enable_install_p
811811
with_tar
812812
enable_strict_v2_mode
813813
with_layout
814+
with_libdir
814815
enable_absolute_install_paths
815816
with_config_file
816817
enable_importing_config_file
@@ -1655,6 +1656,12 @@ Optional Packages:
16551656
Example: --with-layout=fhs
16561657
16571658
1659+
--with-libdir=FILE
1660+
Set the variant of the /lib directory to use. This is useful on systems which support
1661+
more than one binary format requiring separate libraries. The default is lib.
1662+
Example: --with-libdir=lib64
1663+
1664+
16581665
--with-config-file=PATH
16591666
Set the path of the system GNUstep config file. Use this option
16601667
if you want to have the GNUstep config file in a non-standard
@@ -6435,6 +6442,18 @@ if test ! -f "$srcdir/FilesystemLayouts/$GNUSTEP_FILESYSTEM_LAYOUT_FILE" >&5 2>&
64356442
exit 1
64366443
fi
64376444

6445+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for architecture-specific lib path" >&5
6446+
printf %s "checking for architecture-specific lib path... " >&6; }
6447+
6448+
# Check whether --with-libdir was given.
6449+
if test ${with_libdir+y}
6450+
then :
6451+
withval=$with_libdir; LIBDIR="$withval"
6452+
else $as_nop
6453+
LIBDIR="lib"
6454+
fi
6455+
6456+
64386457
# Need to do some checks related to building dylibs on darwin.
64396458
GNUSTEP_ABSOLUTE_INSTALL_PATHS=;
64406459

@@ -6553,38 +6572,38 @@ printf "%s\n" "$GNUSTEP_PREFIX" >&6; }
65536572
# '/home' - we never install anything in there).
65546573
GNUSTEP_MAKEFILES="$GNUSTEP_PREFIX$GNUSTEP_MAKEFILES"
65556574

6556-
GNUSTEP_SYSTEM_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_APPS"
6557-
GNUSTEP_SYSTEM_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_APPS"
6558-
GNUSTEP_SYSTEM_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_WEB_APPS"
6575+
GNUSTEP_SYSTEM_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_APPS" | sed "s/@libdir@/$LIBDIR/g")
6576+
GNUSTEP_SYSTEM_ADMIN_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_APPS" | sed "s/@libdir@/$LIBDIR/g")
6577+
GNUSTEP_SYSTEM_WEB_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_WEB_APPS" | sed "s/@libdir@/$LIBDIR/g")
65596578
GNUSTEP_SYSTEM_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_TOOLS"
65606579
GNUSTEP_SYSTEM_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_TOOLS"
6561-
GNUSTEP_SYSTEM_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARY"
6580+
GNUSTEP_SYSTEM_LIBRARY=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARY" | sed "s/@libdir@/$LIBDIR/g")
65626581
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_HEADERS"
6563-
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARIES"
6582+
GNUSTEP_SYSTEM_LIBRARIES=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARIES" | sed "s/@libdir@/$LIBDIR/g")
65646583
GNUSTEP_SYSTEM_DOC="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOC"
65656584
GNUSTEP_SYSTEM_DOC_MAN="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOC_MAN"
65666585
GNUSTEP_SYSTEM_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOC_INFO"
65676586

6568-
GNUSTEP_NETWORK_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_APPS"
6569-
GNUSTEP_NETWORK_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_APPS"
6570-
GNUSTEP_NETWORK_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_WEB_APPS"
6587+
GNUSTEP_NETWORK_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_APPS" | sed "s/@libdir@/$LIBDIR/g")
6588+
GNUSTEP_NETWORK_ADMIN_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_APPS" | sed "s/@libdir@/$LIBDIR/g")
6589+
GNUSTEP_NETWORK_WEB_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_WEB_APPS" | sed "s/@libdir@/$LIBDIR/g")
65716590
GNUSTEP_NETWORK_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_TOOLS"
65726591
GNUSTEP_NETWORK_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_TOOLS"
6573-
GNUSTEP_NETWORK_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARY"
6592+
GNUSTEP_NETWORK_LIBRARY=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARY" | sed "s/@libdir@/$LIBDIR/g")
65746593
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_HEADERS"
6575-
GNUSTEP_NETWORK_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARIES"
6594+
GNUSTEP_NETWORK_LIBRARIES=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARIES" | sed "s/@libdir@/$LIBDIR/g")
65766595
GNUSTEP_NETWORK_DOC="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOC"
65776596
GNUSTEP_NETWORK_DOC_MAN="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOC_MAN"
65786597
GNUSTEP_NETWORK_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOC_INFO"
65796598

6580-
GNUSTEP_LOCAL_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_APPS"
6581-
GNUSTEP_LOCAL_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_APPS"
6582-
GNUSTEP_LOCAL_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_WEB_APPS"
6599+
GNUSTEP_LOCAL_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_APPS" | sed "s/@libdir@/$LIBDIR/g")
6600+
GNUSTEP_LOCAL_ADMIN_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_APPS" | sed "s/@libdir@/$LIBDIR/g")
6601+
GNUSTEP_LOCAL_WEB_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_WEB_APPS" | sed "s/@libdir@/$LIBDIR/g")
65836602
GNUSTEP_LOCAL_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_TOOLS"
65846603
GNUSTEP_LOCAL_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_TOOLS"
6585-
GNUSTEP_LOCAL_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARY"
6604+
GNUSTEP_LOCAL_LIBRARY=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARY" | sed "s/@libdir@/$LIBDIR/g")
65866605
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_HEADERS"
6587-
GNUSTEP_LOCAL_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARIES"
6606+
GNUSTEP_LOCAL_LIBRARIES=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARIES" | sed "s/@libdir@/$LIBDIR/g")
65886607
GNUSTEP_LOCAL_DOC="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_DOC"
65896608
GNUSTEP_LOCAL_DOC_MAN="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_DOC_MAN"
65906609
GNUSTEP_LOCAL_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_DOC_INFO"

‎configure.ac

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,15 @@ if test ! -f "$srcdir/FilesystemLayouts/$GNUSTEP_FILESYSTEM_LAYOUT_FILE" >&5 2>&
393393
exit 1
394394
fi
395395

396+
AC_MSG_CHECKING([for architecture-specific lib path])
397+
AC_ARG_WITH(libdir,[
398+
--with-libdir=FILE
399+
Set the variant of the /lib directory to use. This is useful on systems which support
400+
more than one binary format requiring separate libraries. The default is lib.
401+
Example: --with-libdir=lib64
402+
],
403+
LIBDIR="$withval",LIBDIR="lib")
404+
396405
# Need to do some checks related to building dylibs on darwin.
397406
GNUSTEP_ABSOLUTE_INSTALL_PATHS=;
398407

@@ -509,38 +518,38 @@ AC_SUBST(GNUSTEP_PREFIX)
509518
# '/home' - we never install anything in there).
510519
GNUSTEP_MAKEFILES="$GNUSTEP_PREFIX$GNUSTEP_MAKEFILES"
511520

512-
GNUSTEP_SYSTEM_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_APPS"
513-
GNUSTEP_SYSTEM_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_APPS"
514-
GNUSTEP_SYSTEM_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_WEB_APPS"
521+
GNUSTEP_SYSTEM_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_APPS" | sed "s/@libdir@/$LIBDIR/g")
522+
GNUSTEP_SYSTEM_ADMIN_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_APPS" | sed "s/@libdir@/$LIBDIR/g")
523+
GNUSTEP_SYSTEM_WEB_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_WEB_APPS" | sed "s/@libdir@/$LIBDIR/g")
515524
GNUSTEP_SYSTEM_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_TOOLS"
516525
GNUSTEP_SYSTEM_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_ADMIN_TOOLS"
517-
GNUSTEP_SYSTEM_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARY"
526+
GNUSTEP_SYSTEM_LIBRARY=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARY" | sed "s/@libdir@/$LIBDIR/g")
518527
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_HEADERS"
519-
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARIES"
528+
GNUSTEP_SYSTEM_LIBRARIES=$(echo "$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_LIBRARIES" | sed "s/@libdir@/$LIBDIR/g")
520529
GNUSTEP_SYSTEM_DOC="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOC"
521530
GNUSTEP_SYSTEM_DOC_MAN="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOC_MAN"
522531
GNUSTEP_SYSTEM_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_SYSTEM_DOC_INFO"
523532

524-
GNUSTEP_NETWORK_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_APPS"
525-
GNUSTEP_NETWORK_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_APPS"
526-
GNUSTEP_NETWORK_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_WEB_APPS"
533+
GNUSTEP_NETWORK_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_APPS" | sed "s/@libdir@/$LIBDIR/g")
534+
GNUSTEP_NETWORK_ADMIN_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_APPS" | sed "s/@libdir@/$LIBDIR/g")
535+
GNUSTEP_NETWORK_WEB_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_WEB_APPS" | sed "s/@libdir@/$LIBDIR/g")
527536
GNUSTEP_NETWORK_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_TOOLS"
528537
GNUSTEP_NETWORK_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_ADMIN_TOOLS"
529-
GNUSTEP_NETWORK_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARY"
538+
GNUSTEP_NETWORK_LIBRARY=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARY" | sed "s/@libdir@/$LIBDIR/g")
530539
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_HEADERS"
531-
GNUSTEP_NETWORK_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARIES"
540+
GNUSTEP_NETWORK_LIBRARIES=$(echo "$GNUSTEP_PREFIX$GNUSTEP_NETWORK_LIBRARIES" | sed "s/@libdir@/$LIBDIR/g")
532541
GNUSTEP_NETWORK_DOC="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOC"
533542
GNUSTEP_NETWORK_DOC_MAN="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOC_MAN"
534543
GNUSTEP_NETWORK_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_NETWORK_DOC_INFO"
535544

536-
GNUSTEP_LOCAL_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_APPS"
537-
GNUSTEP_LOCAL_ADMIN_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_APPS"
538-
GNUSTEP_LOCAL_WEB_APPS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_WEB_APPS"
545+
GNUSTEP_LOCAL_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_APPS" | sed "s/@libdir@/$LIBDIR/g")
546+
GNUSTEP_LOCAL_ADMIN_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_APPS" | sed "s/@libdir@/$LIBDIR/g")
547+
GNUSTEP_LOCAL_WEB_APPS=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_WEB_APPS" | sed "s/@libdir@/$LIBDIR/g")
539548
GNUSTEP_LOCAL_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_TOOLS"
540549
GNUSTEP_LOCAL_ADMIN_TOOLS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_ADMIN_TOOLS"
541-
GNUSTEP_LOCAL_LIBRARY="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARY"
550+
GNUSTEP_LOCAL_LIBRARY=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARY" | sed "s/@libdir@/$LIBDIR/g")
542551
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_HEADERS"
543-
GNUSTEP_LOCAL_LIBRARIES="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARIES"
552+
GNUSTEP_LOCAL_LIBRARIES=$(echo "$GNUSTEP_PREFIX$GNUSTEP_LOCAL_LIBRARIES" | sed "s/@libdir@/$LIBDIR/g")
544553
GNUSTEP_LOCAL_DOC="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_DOC"
545554
GNUSTEP_LOCAL_DOC_MAN="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_DOC_MAN"
546555
GNUSTEP_LOCAL_DOC_INFO="$GNUSTEP_PREFIX$GNUSTEP_LOCAL_DOC_INFO"

0 commit comments

Comments
 (0)