From c6cddebdd3351ad63f59af7205c33988015d4285 Mon Sep 17 00:00:00 2001 From: runge Date: Sun, 11 Jan 2009 04:51:06 +0000 Subject: [PATCH] prepare_x11vnc_dist.sh: fix SUBDIRS and DIST_SUBDRIS when using --with-system-libvncserver --- prepare_x11vnc_dist.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/prepare_x11vnc_dist.sh b/prepare_x11vnc_dist.sh index 647aa9f..39b381a 100644 --- a/prepare_x11vnc_dist.sh +++ b/prepare_x11vnc_dist.sh @@ -18,9 +18,19 @@ sed -e "s/LibVNCServer, [^,)]*\([(,]\)*/x11vnc, $VERSION\1/g" \ mv Makefile.am Makefile.am.LibVNCServer echo "EXTRA_DIST=tightvnc-1.3dev5-vncviewer-alpha-cursor.patch README.LibVNCServer" > Makefile.am +echo "" >> Makefile.am +echo "if HAVE_SYSTEM_LIBVNCSERVER" >> Makefile.am +echo "SUBDIRS=x11vnc classes" >> Makefile.am +echo "DIST_SUBDIRS=x11vnc classes" >> Makefile.am +echo "else" >> Makefile.am +echo "SUBDIRS=libvncserver libvncclient x11vnc classes" >> Makefile.am +echo "DIST_SUBDIRS=libvncserver libvncclient x11vnc classes" >> Makefile.am +echo "endif" >> Makefile.am +echo "" >> Makefile.am + cat Makefile.am.LibVNCServer | \ -sed -e "s/^SUBDIRS.*$/SUBDIRS=libvncserver libvncclient x11vnc classes/" \ - -e "s/^DIST_SUBDIRS.*$/DIST_SUBDIRS=libvncserver libvncclient x11vnc classes/" \ +sed -e "s/^SUBDIRS.*$/#SUBDIRS=libvncserver libvncclient x11vnc classes/" \ + -e "s/^DIST_SUBDIRS.*$/#DIST_SUBDIRS=libvncserver libvncclient x11vnc classes/" \ -e "/all: make_config_executable/,\$d" \ -e "/^.*bin_SCRIPTS.*$/d" \ -e "s/include_/noinst_/" \