diff -r fribidi-0.19.1/bin/Makefile.am fribidi2-0.19.1/bin/Makefile.am
1c1
< bin_PROGRAMS = fribidi
---
> bin_PROGRAMS = fribidi2
7c7
< fribidi_SOURCES = fribidi-main.c $(getopt_SOURCES)
---
> fribidi2_SOURCES = fribidi-main.c $(getopt_SOURCES)
17c17
< LDADD = $(top_builddir)/lib/libfribidi.la $(MISC_LIBS)
---
> LDADD = $(top_builddir)/lib/libfribidi2.la $(MISC_LIBS)
24,25c24,25
< $(top_builddir)/lib/libfribidi.la:
< 	cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) libfribidi.la
---
> $(top_builddir)/lib/libfribidi2.la:
> 	cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) libfribidi2.la
diff -r fribidi-0.19.1/configure.ac fribidi2-0.19.1/configure.ac
41c41
< AC_INIT([GNU FriBidi],fribidi_version(),[http://fribidi.org/bug])
---
> AC_INIT([GNU FriBidi2],fribidi_version(),[http://fribidi.org/bug])
202c202
< AC_CONFIG_FILES([fribidi.pc
---
> AC_CONFIG_FILES([fribidi2.pc
Only in fribidi2-0.19.1: fribidi2.pc.in
Only in fribidi-0.19.1: fribidi.pc.in
diff -r fribidi-0.19.1/lib/Headers.mk fribidi2-0.19.1/lib/Headers.mk
1c1
< libfribidi_la_headers = \
---
> libfribidi2_la_headers = \
22c22
< libfribidi_la_symbols = $(shell cat $(top_srcdir)/lib/fribidi.def)
---
> libfribidi2_la_symbols = $(shell cat $(top_srcdir)/lib/fribidi.def)
diff -r fribidi-0.19.1/lib/Makefile.am fribidi2-0.19.1/lib/Makefile.am
3c3
< lib_LTLIBRARIES = libfribidi.la
---
> lib_LTLIBRARIES = libfribidi2.la
7,9c7,9
< libfribidi_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO)
< libfribidi_la_LIBADD = $(MISC_LIBS)
< libfribidi_la_DEPENDENCIES =
---
> libfribidi2_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO)
> libfribidi2_la_LIBADD = $(MISC_LIBS)
> libfribidi2_la_DEPENDENCIES =
12c12
< libfribidi_la_LDFLAGS += -export-symbols $(srcdir)/fribidi.def
---
> libfribidi2_la_LDFLAGS += -export-symbols $(srcdir)/fribidi.def
18,19c18,19
< libfribidi_la_LIBADD += $(top_builddir)/charset/libfribidi-char-sets.la
< libfribidi_la_DEPENDENCIES += $(top_builddir)/charset/libfribidi-char-sets.la
---
> libfribidi2_la_LIBADD += $(top_builddir)/charset/libfribidi-char-sets.la
> libfribidi2_la_DEPENDENCIES += $(top_builddir)/charset/libfribidi-char-sets.la
27c27
< pkginclude_HEADERS = $(libfribidi_la_headers)
---
> pkginclude_HEADERS = $(libfribidi2_la_headers)
30c30
< libfribidi_la_SOURCES =	\
---
> libfribidi2_la_SOURCES =	\
diff -r fribidi-0.19.1/test/Makefile.am fribidi2-0.19.1/test/Makefile.am
28c28
< 	$(top_builddir)/bin/fribidi --test --charset "$$charset" "$<" > "$@" \
---
> 	$(top_builddir)/bin/fribidi2 --test --charset "$$charset" "$<" > "$@" \
diff -r fribidi-0.19.1/test/run.tests fribidi2-0.19.1/test/run.tests
39,40c39,40
< if ! test -f "$top_builddir/bin/fribidi"; then
<   echo "run.tests: you must make fribidi first"
---
> if ! test -f "$top_builddir/bin/fribidi2"; then
>   echo "run.tests: you must make fribidi2 first"
51c51
<   if ! "$top_builddir/bin/fribidi" --charset "$charset" </dev/null >/dev/null 2>&1; then
---
>   if ! "$top_builddir/bin/fribidi2" --charset "$charset" </dev/null >/dev/null 2>&1; then
55c55
<   "$top_builddir/bin/fribidi" --test --charset "$charset" "$testcase" > "$test.output"
---
>   "$top_builddir/bin/fribidi2" --test --charset "$charset" "$testcase" > "$test.output"