Skip to content

Commit fa2a187

Browse files
authored
Merge pull request #7 from dwoz/pkgdata
Fix package data location
2 parents 33cc0c3 + 103d398 commit fa2a187

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

src/gdbdbg/build.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@ def build_gdb(prefix):
4646
os.environ["CFLAGS"] = (
4747
f"{os.environ['CFLAGS']} -I{os.environ['RELENV_PATH']}/include/ncursesw "
4848
f"-I{os.environ['RELENV_PATH']}/include/readline "
49-
f"-I{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/relenv_gdb/gdb/include"
49+
f"-I{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/gdbdbg/gdb/include"
5050
)
5151
os.environ["CPPFLAGS"] = (
5252
f"{os.environ['CPPFLAGS']} -I{os.environ['RELENV_PATH']}/include/ncursesw "
5353
f"-I{os.environ['RELENV_PATH']}/include/readline "
54-
f"-I{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/relenv_gdb/gdb/include"
54+
f"-I{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/gdbdbg/gdb/include"
5555
)
5656
os.environ["LDFLAGS"] = (
5757
f"{os.environ['LDFLAGS']} "
58-
f"-L{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/relenv_gdb/gdb/lib "
58+
f"-L{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/gdbdbg/gdb/lib "
5959
)
6060

6161
print(f"Build environment: {pprint.pformat(dict(os.environ))}")
@@ -74,7 +74,7 @@ def build_gdb(prefix):
7474
subprocess.run(
7575
[
7676
"./configure",
77-
f"--prefix={os.environ['RELENV_PATH']}/lib/python3.10/site-packages/relenv_gdb/gdb",
77+
f"--prefix={os.environ['RELENV_PATH']}/lib/python3.10/site-packages/gdbdbg/gdb",
7878
],
7979
check=True,
8080
)
@@ -94,7 +94,7 @@ def build_gdb(prefix):
9494
subprocess.run(
9595
[
9696
"./configure",
97-
f"--prefix={os.environ['RELENV_PATH']}/lib/python3.10/site-packages/relenv_gdb/gdb",
97+
f"--prefix={os.environ['RELENV_PATH']}/lib/python3.10/site-packages/gdbdbg/gdb",
9898
],
9999
check=True,
100100
)
@@ -126,7 +126,7 @@ def build_gdb(prefix):
126126
subprocess.run(
127127
[
128128
"./configure",
129-
f"--prefix={os.environ['RELENV_PATH']}/lib/python3.10/site-packages/relenv_gdb/gdb",
129+
f"--prefix={os.environ['RELENV_PATH']}/lib/python3.10/site-packages/gdbdbg/gdb",
130130
f"--with-python={os.environ['RELENV_PATH']}/bin/python3",
131131
"--with-lzma",
132132
"--with-separate-debug-dir=/usr/lib/debug",
@@ -150,13 +150,13 @@ def build_gdb(prefix):
150150
subprocess.run(["make", "install"])
151151

152152
relenv.relocate.main(
153-
f"{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/relenv_gdb/gdb",
154-
f"{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/relenv_gdb/gdb/lib",
153+
f"{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/gdbdbg/gdb",
154+
f"{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/gdbdbg/gdb/lib",
155155
False,
156156
)
157157
shutil.copytree(
158-
f"{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/relenv_gdb/gdb",
159-
"src/relenv_gdb/gdb",
158+
f"{os.environ['RELENV_PATH']}/lib/python3.10/site-packages/gdbdbg/gdb",
159+
"src/gdbdbg/gdb",
160160
)
161161

162162

0 commit comments

Comments
 (0)