Skip to content

Commit

Permalink
Fix installation of headers with parallel install.
Browse files Browse the repository at this point in the history
The pkginclude was not fully implemented in src/Makefile* and that leaded
to creation $(includedir)/libfm instead of symlink.
  • Loading branch information
LStranger committed Sep 11, 2014
1 parent aa1dd15 commit 24c8eab
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/Makefile.am
Expand Up @@ -153,11 +153,13 @@ libfm_gtk_SOURCES = \
gtk/fm-thumbnail.c \
$(NULL)

# we use common include directory for all headers
pkgincludedir = $(includedir)/@PACKAGE@-@FMLIBVER@

if EXTRALIB_ONLY
pkginclude_HEADERS = $(LIBFM_EXTRA_INCLUDES)
else
libfmincludedir = $(includedir)/@PACKAGE@-@FMLIBVER@
libfminclude_HEADERS = \
LIBFM_INCLUDES = \
fm.h \
fm-seal.h \
base/fm-app-info.h \
Expand Down Expand Up @@ -194,8 +196,7 @@ libfminclude_HEADERS = \
job/fm-simple-job.h \
$(NULL)

libfmgtkincludedir = $(includedir)/@PACKAGE@-@FMLIBVER@
libfmgtkinclude_HEADERS = \
LIBFM_GTK_INCLUDES = \
fm-gtk.h \
gtk/fm-app-chooser-combo-box.h \
gtk/fm-app-chooser-dlg.h \
Expand Down Expand Up @@ -236,8 +237,7 @@ pkginclude_HEADERS = \
$(NULL)
endif

libfmextraincludedir = $(includedir)/@PACKAGE@-@FMLIBVER@
libfmextrainclude_HEADERS = \
LIBFM_EXTRA_INCLUDES = \
fm-extra.h \
fm-version.h \
extra/fm-xml-file.h \
Expand Down

0 comments on commit 24c8eab

Please sign in to comment.