Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/nxserver-freenx/patches/nxserver-freenx-0.7.3-ignore-system-nxloadconfig.patch

    Contents of /trunk/nxserver-freenx/patches/nxserver-freenx-0.7.3-ignore-system-nxloadconfig.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1798 - (show annotations) (download)
    Tue Jun 5 13:06:28 2012 UTC (11 years, 10 months ago) by niro
    File size: 888 byte(s) 
    -fixed installation when a systemwide nxloadconfig app was found
    1 diff -Naur freenx-server-0.7.3/Makefile freenx-server-0.7.3-magellan/Makefile
    2 --- freenx-server-0.7.3/Makefile 2012-06-05 13:58:56.473982660 +0200
    3 +++ freenx-server-0.7.3-magellan/Makefile 2012-06-05 16:06:08.053982899 +0200
    4 @@ -1,5 +1,6 @@
    5 .PHONY: all install clean nxenv_install suid_install
    6
    7 +SRCDIR = .
    8 SHELL = /bin/bash
    9
    10 SUBDIRS=nxredir nxviewer-passwd nxserver-helper nxserver-suid nx-session-launcher
    11 @@ -7,7 +8,7 @@
    12
    13 all:
    14 cd nxviewer-passwd && xmkmf && make Makefiles && make depend
    15 - source nxloadconfig &&\
    16 + source $(SRCDIR)/nxloadconfig &&\
    17 export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\
    18 for i in $(SUBDIRS) ; \
    19 do\
    20 @@ -49,7 +50,7 @@
    21 rm -f nxviewer-passwd/libvncauth/Makefile
    22
    23 install:
    24 - source nxloadconfig &&\
    25 + source $(SRCDIR)/nxloadconfig &&\
    26 export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\
    27 $(MAKE) nxenv_install
    28