artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

core: Remove MES_PKGDATADIR.

Browse source 
* configure: Do not add MES_PKGDATADIR to config.h.
* configure.sh: Likewise.
* simple.sh: Likewise.
* src/mes.c (open_boot): Do not use MES_PKGDATADIR; rely on
MES_PREFIX or cwd.
This commit is contained in:
Jan Nieuwenhuizen 2019-12-03 21:23:24 +01:00
parent 2659caeffa
commit 0549ebd0f7
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
4 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure vendored
View file

@ -666,7 +666,6 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
")) "))
(display (string-append " (display (string-append "
#define MES_VERSION \"" VERSION "\" #define MES_VERSION \"" VERSION "\"
#define MES_PKGDATADIR \"" pkgdatadir "\"
"))))) ")))))
(substitute (string-append srcdest "build-aux/config.make.in") pairs #:target ".config.make")) (substitute (string-append srcdest "build-aux/config.make.in") pairs #:target ".config.make"))

1
configure.sh
View file

@ -244,7 +244,6 @@ EOF
fi fi
cat >> include/mes/config.h <<EOF cat >> include/mes/config.h <<EOF
#define MES_VERSION "$VERSION" #define MES_VERSION "$VERSION"
#define MES_PKGDATADIR "$pkgdatadir"
EOF EOF
cat <<EOF cat <<EOF

2
simple.sh
View file

@ -33,7 +33,6 @@ mes_bits=64
cat > include/mes/config.h <<EOF cat > include/mes/config.h <<EOF
#define SYSTEM_LIBC 1 #define SYSTEM_LIBC 1
#define MES_VERSION "git" #define MES_VERSION "git"
#define MES_PKGDATADIR "/usr/local/share/mes"
EOF EOF
## Build ## ## Build ##
@ -126,7 +125,6 @@ mes_cpu=x86_64
cat > include/mes/config.h <<EOF cat > include/mes/config.h <<EOF
// #define SYSTEM_LIBC 0 // #define SYSTEM_LIBC 0
#define MES_VERSION "git" #define MES_VERSION "git"
#define MES_PKGDATADIR "/usr/local/share/mes"
EOF EOF
## Build ## ## Build ##

13
src/mes.c
View file

@ -1775,12 +1775,6 @@ open_boot ()
char boot[1024]; char boot[1024];
char file_name[1024]; char file_name[1024];
strcpy (g_datadir, "."); strcpy (g_datadir, ".");
if (g_debug > 1)
{
eputs (";;; pkgdatadir=");
eputs (MES_PKGDATADIR);
eputs ("\n");
}
if (getenv ("MES_BOOT")) if (getenv ("MES_BOOT"))
strcpy (boot, getenv ("MES_BOOT")); strcpy (boot, getenv ("MES_BOOT"));
else else
@ -1801,13 +1795,6 @@ open_boot ()
__stdin = try_open_boot (file_name, boot, "MES_PREFIX/share/mes"); __stdin = try_open_boot (file_name, boot, "MES_PREFIX/share/mes");
} }
} }
if (__stdin < 0)
{
strcpy (g_datadir, MES_PKGDATADIR);
strcpy (file_name, g_datadir);
strcpy (file_name + strlen (file_name), "/module/mes/");
__stdin = try_open_boot (file_name, boot, "pkgdatadir");
}
if (__stdin < 0) if (__stdin < 0)
{ {
g_datadir[0] = 0; g_datadir[0] = 0;