Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nx-libs
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dimbor
nx-libs
Commits
892c08dd
Commit
892c08dd
authored
Feb 16, 2015
by
Mike Gabriel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make install-lite rule in Makefile.nx-libs more predictable and not rely on nxproxy/Makefile.in.
parent
f29cc29f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
Makefile
Makefile
+10
-5
changelog
debian/changelog
+2
-0
No files found.
Makefile
View file @
892c08dd
...
...
@@ -59,17 +59,22 @@ install:
[
!
-d
nx-X11
]
||
$(MAKE)
install-full
install-lite
:
# install nxcomp library
$(MAKE)
-C
nxcomp
install
# install nxproxy wrapper script
$(INSTALL_DIR)
$(DESTDIR)$(BINDIR)
for
d
in
nxcomp nxproxy
;
do
\
$(MAKE)
-C
$$
d
install
;
done
for
f
in
nxproxy
;
do
\
$(INSTALL_PROGRAM)
bin/
$$
f
$(DESTDIR)$(BINDIR)
;
done
$(INSTALL_PROGRAM)
bin/nxproxy
$(DESTDIR)$(BINDIR)
# FIXME: the below install logic should work via nxproxy/Makefile.in
# overriding for now...
$(INSTALL_DIR)
$(DESTDIR)$(NXLIBDIR)/bin
$(INSTALL_PROGRAM)
nxproxy/nxproxy
$(DESTDIR)$(NXLIBDIR)/bin
$(INSTALL_DIR)
$(DESTDIR)$(PREFIX)/share/man/man1/
$(INSTALL_FILE)
nxproxy/man/nxproxy.1
$(DESTDIR)$(PREFIX)/share/man/man1/
gzip
$(DESTDIR)$(PREFIX)/share/man/man1/*.1
install-full
:
for
f
in
nxagent nxauth x2goagent
;
do
\
$(INSTALL_PROGRAM)
bin/
$$
f
$(DESTDIR)$(BINDIR)
;
done
...
...
debian/changelog
View file @
892c08dd
...
...
@@ -34,6 +34,8 @@ nx-libs (2:3.5.0.29-0x2go2) UNRELEASED; urgency=medium
* Add Description: and Author: fields to various patch headers.
* Makefile.nx-libs: Run make install for nxproxy first, then create the
wrapper script.
* Make install-lite rule in Makefile.nx-libs more predictable and not
rely on nxproxy/Makefile.in.
* NX code reduction efforts (from 93Mb to 41Mb):
- Drop more unused code in nx-X11/programs/Xserver/hw/. Do this in
...
...
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