Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
2f956a4e
Commit
2f956a4e
authored
Apr 04, 2016
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Support installing scripts from the tools directory.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
43637ce9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
21 deletions
+35
-21
makedep.c
tools/makedep.c
+35
-21
No files found.
tools/makedep.c
View file @
2f956a4e
...
...
@@ -2140,52 +2140,66 @@ static struct strarray output_install_rules( const struct makefile *make, struct
if
(
!
files
.
count
)
return
uninstall
;
for
(
i
=
0
;
i
<
files
.
count
;
i
+=
2
)
if
(
strchr
(
"dps"
,
files
.
str
[
i
+
1
][
0
]
))
/* only for files copied from object dir */
strarray_add_uniq
(
&
targets
,
files
.
str
[
i
]
);
{
const
char
*
file
=
files
.
str
[
i
];
switch
(
*
files
.
str
[
i
+
1
])
{
case
'd'
:
/* data file */
case
'p'
:
/* program file */
case
's'
:
/* script */
strarray_add_uniq
(
&
targets
,
obj_dir_path
(
make
,
file
));
break
;
case
't'
:
/* script in tools dir */
strarray_add_uniq
(
&
targets
,
tools_dir_path
(
make
,
file
));
break
;
}
}
output
(
"install %s::"
,
target
);
output_filenames
_obj_dir
(
make
,
targets
);
output_filenames
(
targets
);
output
(
"
\n
"
);
install_sh
=
top_src_dir_path
(
make
,
"tools/install-sh"
);
for
(
i
=
0
;
i
<
files
.
count
;
i
+=
2
)
{
const
char
*
file
=
files
.
str
[
i
];
const
char
*
dest
=
files
.
str
[
i
+
1
]
;
const
char
*
dest
=
strmake
(
"$(DESTDIR)%s"
,
files
.
str
[
i
+
1
]
+
1
)
;
switch
(
*
dest
)
switch
(
*
files
.
str
[
i
+
1
]
)
{
case
'd'
:
/* data file */
output
(
"
\t
%s -m 644 $(INSTALL_DATA_FLAGS) %s
$(DESTDIR)
%s
\n
"
,
install_sh
,
obj_dir_path
(
make
,
file
),
dest
+
1
);
output
(
"
\t
%s -m 644 $(INSTALL_DATA_FLAGS) %s %s
\n
"
,
install_sh
,
obj_dir_path
(
make
,
file
),
dest
);
break
;
case
'D'
:
/* data file in source dir */
output
(
"
\t
%s -m 644 $(INSTALL_DATA_FLAGS) %s
$(DESTDIR)
%s
\n
"
,
install_sh
,
src_dir_path
(
make
,
file
),
dest
+
1
);
output
(
"
\t
%s -m 644 $(INSTALL_DATA_FLAGS) %s %s
\n
"
,
install_sh
,
src_dir_path
(
make
,
file
),
dest
);
break
;
case
'p'
:
/* program file */
output
(
"
\t
STRIPPROG=
\"
$(STRIP)
\"
%s $(INSTALL_PROGRAM_FLAGS) %s
$(DESTDIR)
%s
\n
"
,
install_sh
,
obj_dir_path
(
make
,
file
),
dest
+
1
);
output
(
"
\t
STRIPPROG=
\"
$(STRIP)
\"
%s $(INSTALL_PROGRAM_FLAGS) %s %s
\n
"
,
install_sh
,
obj_dir_path
(
make
,
file
),
dest
);
break
;
case
's'
:
/* script */
output
(
"
\t
%s $(INSTALL_SCRIPT_FLAGS) %s
$(DESTDIR)
%s
\n
"
,
install_sh
,
obj_dir_path
(
make
,
file
),
dest
+
1
);
output
(
"
\t
%s $(INSTALL_SCRIPT_FLAGS) %s %s
\n
"
,
install_sh
,
obj_dir_path
(
make
,
file
),
dest
);
break
;
case
'S'
:
/* script in source dir */
output
(
"
\t
%s $(INSTALL_SCRIPT_FLAGS) %s $(DESTDIR)%s
\n
"
,
install_sh
,
src_dir_path
(
make
,
file
),
dest
+
1
);
output
(
"
\t
%s $(INSTALL_SCRIPT_FLAGS) %s %s
\n
"
,
install_sh
,
src_dir_path
(
make
,
file
),
dest
);
break
;
case
't'
:
/* script in tools dir */
output
(
"
\t
%s $(INSTALL_SCRIPT_FLAGS) %s %s
\n
"
,
install_sh
,
tools_dir_path
(
make
,
file
),
dest
);
break
;
case
'y'
:
/* symlink */
output
(
"
\t
rm -f
$(DESTDIR)%s && %s %s $(DESTDIR)%s
\n
"
,
dest
+
1
,
ln_s
,
file
,
dest
+
1
);
output
(
"
\t
rm -f
%s && %s %s %s
\n
"
,
dest
,
ln_s
,
file
,
dest
);
break
;
default:
assert
(
0
);
}
strarray_add
(
&
uninstall
,
dest
);
}
for
(
i
=
0
;
i
<
files
.
count
;
i
+=
2
)
strarray_add
(
&
uninstall
,
strmake
(
"$(DESTDIR)%s"
,
files
.
str
[
i
+
1
]
+
1
));
strarray_add_uniq
(
phony_targets
,
"install"
);
strarray_add_uniq
(
phony_targets
,
target
);
return
uninstall
;
...
...
@@ -2808,8 +2822,8 @@ static struct strarray output_sources( const struct makefile *make )
else
if
(
*
dll_ext
)
{
char
*
binary
=
replace_extension
(
make
->
module
,
".exe"
,
""
);
add_install_rule
(
make
,
install_rules
,
binary
,
tools_dir_path
(
make
,
"wineapploader"
)
,
strmake
(
"
s
$(bindir)/%s"
,
binary
));
add_install_rule
(
make
,
install_rules
,
binary
,
"wineapploader"
,
strmake
(
"
t
$(bindir)/%s"
,
binary
));
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment