Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
re6stnet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
zhifan huang
re6stnet
Commits
63a4702c
Commit
63a4702c
authored
May 04, 2022
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
When installing, try 'python2' first, fall back on 'python'
parent
4fe44ea3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Makefile
Makefile
+2
-2
debian/common.mk
debian/common.mk
+1
-1
No files found.
Makefile
View file @
63a4702c
...
@@ -2,6 +2,7 @@ DESTDIR = /
...
@@ -2,6 +2,7 @@ DESTDIR = /
PREFIX
=
/usr/local
PREFIX
=
/usr/local
MANDIR
=
$(PREFIX)
/share/man
MANDIR
=
$(PREFIX)
/share/man
UNITDIR
=
/lib/systemd/system
UNITDIR
=
/lib/systemd/system
PYTHON
=
$(
or
$(
shell
command
-v
python2
)
,python
)
MANPAGELIST
:=
$(
patsubst
%,docs/%,re6st-conf.1 re6st-registry.1 re6stnet.8
)
MANPAGELIST
:=
$(
patsubst
%,docs/%,re6st-conf.1 re6st-registry.1 re6stnet.8
)
...
@@ -17,8 +18,7 @@ install: install-noinit
...
@@ -17,8 +18,7 @@ install: install-noinit
install-noinit
:
install-man
install-noinit
:
install-man
set
-e
$(DESTDIR)$(PREFIX)
/bin/re6stnet
;
[
-x
$$
1
$$
2
]
||
\
set
-e
$(DESTDIR)$(PREFIX)
/bin/re6stnet
;
[
-x
$$
1
$$
2
]
||
\
$(
or
$(PYTHON)
,python2
)
setup.py
install
\
$(PYTHON)
setup.py
install
--prefix
=
$(PREFIX)
--root
=
$(DESTDIR)
;
\
--prefix
=
$(PREFIX)
--root
=
$(DESTDIR)
;
\
install
-d
$$
1/sbin
;
mv
$$
1
$$
2
$$
1/sbin
install
-d
$$
1/sbin
;
mv
$$
1
$$
2
$$
1/sbin
install
-Dpm
0644 daemon/README.conf
$(DESTDIR)
/etc/re6stnet/README
install
-Dpm
0644 daemon/README.conf
$(DESTDIR)
/etc/re6stnet/README
install
-Dpm
0644 daemon/logrotate.conf
$(DESTDIR)
/etc/logrotate.d/re6stnet
install
-Dpm
0644 daemon/logrotate.conf
$(DESTDIR)
/etc/logrotate.d/re6stnet
...
...
debian/common.mk
View file @
63a4702c
...
@@ -16,7 +16,7 @@ debian/changelog:
...
@@ -16,7 +16,7 @@ debian/changelog:
endif
endif
override_dh_install
:
override_dh_install
:
make
DESTDIR
=
$(TMP)
PREFIX
=
/usr
PYTHON
=
/usr/bin/python
install
make
DESTDIR
=
$(TMP)
PREFIX
=
/usr
install
# BBB: compat < 10 ; https://bugs.debian.org/879727
# BBB: compat < 10 ; https://bugs.debian.org/879727
override_dh_systemd_start
:
override_dh_systemd_start
:
...
...
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