diff options
Diffstat (limited to 'nxproxy')
| -rw-r--r-- | nxproxy/Makefile.in | 21 | ||||
| -rw-r--r-- | nxproxy/configure.in | 4 |
2 files changed, 18 insertions, 7 deletions
diff --git a/nxproxy/Makefile.in b/nxproxy/Makefile.in index 928e0d34e..6fea52fd3 100644 --- a/nxproxy/Makefile.in +++ b/nxproxy/Makefile.in @@ -33,7 +33,7 @@ LIBS = @LIBS@ srcdir = @srcdir@ prefix = @prefix@ -exec_prefix = @exec_prefix@ +exec_prefix = @exec_prefix@/lib/nx bindir = @bindir@ man1dir = @mandir@/man1 VPATH = @srcdir@ @@ -41,6 +41,8 @@ VPATH = @srcdir@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +DESTDIR = +RM_FILE = rm -f # # This should be autodetected. @@ -87,15 +89,24 @@ depend.status: install: install.bin install.man install.bin: $(PROGRAM) - $(srcdir)/mkinstalldirs $(bindir) - $(INSTALL) $(PROGRAM) $(bindir)/$(PROGRAM) + $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) install.man: - $(srcdir)/mkinstalldirs $(man1dir) + $(srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) + $(INSTALL_DATA) man/$(PROGRAM).1 $(DESTDIR)$(man1dir)/$(PROGRAM).1 + +uninstall: uninstall.bin uninstall.man + +uninstall.bin: + $(RM_FILE) $(DESTDIR)$(bindir)/$(PROGRAM) + +uninstall.man: + $(RM_FILE) $(DESTDIR)$(man1dir)/nxproxy.1 clean: -rm -f *~ *.o *.bak st?????? core core.* *.out.* \ $(PROGRAM) $(PROGRAM).exe $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) distclean: clean - -rm -f config.status config.log config.cache depend.status Makefile tags + -rm -rf autom4te.cache config.status config.log config.cache depend.status Makefile tags configure diff --git a/nxproxy/configure.in b/nxproxy/configure.in index bd930f166..b86828d02 100644 --- a/nxproxy/configure.in +++ b/nxproxy/configure.in @@ -7,8 +7,8 @@ AC_PREREQ(2.13) dnl Reset default compilation flags. -CXXFLAGS="-O3" -CPPFLAGS="-O3" +CXXFLAGS="$CXXFLAGS -O3" +CPPFLAGS="$CPPFLAGS -O3" dnl Prefer headers and libraries from nx-X11 if present. |