Commit c6cddebd authored by runge's avatar runge

prepare_x11vnc_dist.sh: fix SUBDIRS and DIST_SUBDRIS when using --with-system-libvncserver

parent 198382dc
...@@ -18,9 +18,19 @@ sed -e "s/LibVNCServer, [^,)]*\([(,]\)*/x11vnc, $VERSION\1/g" \ ...@@ -18,9 +18,19 @@ sed -e "s/LibVNCServer, [^,)]*\([(,]\)*/x11vnc, $VERSION\1/g" \
mv Makefile.am Makefile.am.LibVNCServer mv Makefile.am Makefile.am.LibVNCServer
echo "EXTRA_DIST=tightvnc-1.3dev5-vncviewer-alpha-cursor.patch README.LibVNCServer" > Makefile.am 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 | \ cat Makefile.am.LibVNCServer | \
sed -e "s/^SUBDIRS.*$/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 "s/^DIST_SUBDIRS.*$/#DIST_SUBDIRS=libvncserver libvncclient x11vnc classes/" \
-e "/all: make_config_executable/,\$d" \ -e "/all: make_config_executable/,\$d" \
-e "/^.*bin_SCRIPTS.*$/d" \ -e "/^.*bin_SCRIPTS.*$/d" \
-e "s/include_/noinst_/" \ -e "s/include_/noinst_/" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment