DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for spaces in filenames (12/x)

Browse Source 
This takes care of dist files.

GNU Make is required for this to work.
This commit is contained in:
Pierre Pronchery 2019-02-28 15:29:27 +01:00
parent a9da947c54
commit 257e023be6
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/makefile.c
View File

@ -2688,9 +2688,8 @@ static int _install_include(Makefile * makefile, String const * include)
static int _dist_check(Makefile * makefile, char const * target, static int _dist_check(Makefile * makefile, char const * target,
char const * mode); char const * mode);
static int _dist_install(Makefile * makefile, static int _dist_install(Makefile * makefile, char const * directory,
char const * directory, char const * mode, char const * mode, char const * filename);
char const * filename);
static int _install_dist(Makefile * makefile) static int _install_dist(Makefile * makefile)
{ {
int ret = 0; int ret = 0;
@ -2758,9 +2757,8 @@ static int _dist_check(Makefile * makefile, char const * target,
return 0; return 0;
} }
static int _dist_install(Makefile * makefile, static int _dist_install(Makefile * makefile, char const * directory,
char const * directory, char const * mode, char const * mode, char const * filename)
char const * filename)
{ {
String * p; String * p;
char const * q; char const * q;
@ -2777,9 +2775,15 @@ static int _dist_install(Makefile * makefile,
} }
else else
_makefile_mkdir(makefile, directory); _makefile_mkdir(makefile, directory);
_makefile_print(makefile, "%s%s%s%s%s%s/%s\n", "\t$(INSTALL) -m ", _makefile_print(makefile, "%s", "\t$(INSTALL) -m ");
mode, " ", filename, " $(DESTDIR)", directory, _makefile_print_escape(makefile, mode);
filename); _makefile_print(makefile, " ");
_makefile_print_escape(makefile, filename);
_makefile_print(makefile, " $(DESTDIR)");
_makefile_print_escape(makefile, directory);
_makefile_print(makefile, "/");
_makefile_print_escape(makefile, filename);
_makefile_print(makefile, "\n");
return 0; return 0;
} }
@ -3072,8 +3076,11 @@ static int _uninstall_dist(Makefile * makefile,
if((install = _makefile_get_config(makefile, dist, "install")) == NULL) if((install = _makefile_get_config(makefile, dist, "install")) == NULL)
return 0; return 0;
_makefile_print(makefile, "%s%s/%s\n", "\t$(RM) -- $(DESTDIR)", install, _makefile_print(makefile, "%s", "\t$(RM) -- $(DESTDIR)");
dist); _makefile_print_escape(makefile, install);
_makefile_print(makefile, "/");
_makefile_print_escape(makefile, dist);
_makefile_print(makefile, "\n");
return 0; return 0;
} }