summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrunge <runge>2009-01-11 04:51:06 +0000
committerrunge <runge>2009-01-11 04:51:06 +0000
commitc6cddebdd3351ad63f59af7205c33988015d4285 (patch)
tree82006c00ad685991a5d8227dfcec22a22a0b999a
parent198382dcf3c9b86919b7b69b9cedff7a162ba9cf (diff)
downloadlibtdevnc-c6cddebd.tar.gz
libtdevnc-c6cddebd.zip
prepare_x11vnc_dist.sh: fix SUBDIRS and DIST_SUBDRIS when using --with-system-libvncserver
-rw-r--r--prepare_x11vnc_dist.sh14
1 files 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_/" \