--- libfm-1.3.1/Makefile.in.old	2018-12-17 19:18:43.000000000 +0000
+++ libfm-1.3.1/Makefile.in	2019-06-04 01:33:11.797284687 +0000
@@ -461,7 +461,7 @@
 	docs/reference/libfm/version.xml.in
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libfm-extra.pc $(am__append_5)
+pkgconfig_DATA = $(am__append_5)
 @EXTRALIB_ONLY_FALSE@SUBDIRS = $(DIST_SUBDIRS) $(am__append_3)
 @EXTRALIB_ONLY_TRUE@SUBDIRS = src $(am__append_3)
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--- libfm-1.3.1/data/Makefile.in.old	2018-12-17 19:18:43.000000000 +0000
+++ libfm-1.3.1/data/Makefile.in	2019-06-04 01:38:26.663631036 +0000
@@ -406,7 +406,7 @@
 mime_DATA = libfm.xml
 libfmconfdir = $(sysconfdir)/xdg/libfm
 libfmconf_DATA = \
-	libfm.conf \
+	libfm.conf.sample \
 	$(NULL)
 
 desktop_in_files = \
--- libfm-1.3.1/src/Makefile.in.old	2018-12-17 19:18:44.000000000 +0000
+++ libfm-1.3.1/src/Makefile.in	2019-06-04 01:35:34.592026293 +0000
@@ -909,14 +909,14 @@
 @EXTRALIB_ONLY_FALSE@	gtk/fm-thumbnail.h \
 @EXTRALIB_ONLY_FALSE@	$(NULL)
 
-LIBFM_EXTRA_INCLUDES = \
-	fm-extra.h \
-	fm-version.h \
-	extra/fm-xml-file.h \
-	$(NULL)
+@EXTRALIB_ONLY_TRUE@LIBFM_EXTRA_INCLUDES = \
+@EXTRALIB_ONLY_TRUE@	fm-extra.h \
+@EXTRALIB_ONLY_TRUE@	fm-version.h \
+@EXTRALIB_ONLY_TRUE@	extra/fm-xml-file.h \
+@EXTRALIB_ONLY_TRUE@	$(NULL)
 
 EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la
-@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm-extra.la libfm.la @LIBFM_GTK_LTLIBRARIES@
+@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@
 @EXTRALIB_ONLY_TRUE@lib_LTLIBRARIES = libfm-extra.la
 libfm_la_SOURCES = \
 	$(libfm_SOURCES) \
@@ -1059,7 +1059,7 @@
 @ENABLE_DEMO_TRUE@	$(GTK_LIBS) \
 @ENABLE_DEMO_TRUE@	$(INTLLIBS) \
 @ENABLE_DEMO_TRUE@	libfm.la \
-@ENABLE_DEMO_TRUE@	libfm-extra.la \
+@ENABLE_DEMO_TRUE@	-lfm-extra \
 @ENABLE_DEMO_TRUE@	@LIBFM_GTK_LTLIBRARIES@ \
 @ENABLE_DEMO_TRUE@	$(NULL)
 
--- libfm-1.3.1/src/modules/Makefile.in.old	2018-12-17 19:18:44.000000000 +0000
+++ libfm-1.3.1/src/modules/Makefile.in	2019-06-04 01:37:50.457501640 +0000
@@ -180,8 +180,7 @@
 	$(gtk_menu_trash_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
 @ENABLE_GTK_TRUE@am_gtk_menu_trash_la_rpath = -rpath $(pkglibdir)
-vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/src/libfm-extra.la
+vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 vfs_menu_la_SOURCES = vfs-menu.c
 vfs_menu_la_OBJECTS = vfs_menu_la-vfs-menu.lo
 vfs_menu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -459,7 +458,7 @@
 
 # module-specific parameters
 vfs_menu_la_CFLAGS = $(MENU_CACHE_CFLAGS) -I$(top_srcdir)/src/extra
-vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) $(top_builddir)/src/libfm-extra.la
+vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) -lfm-extra
 gtk_fileprop_x_desktop_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk
 gtk_fileprop_x_desktop_la_LIBADD = $(GTK_LIBS)
 gtk_fileprop_x_shortcut_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk