Skip to content

Commit

Permalink
libmarco-private: remove '-1' part from include dir name
Browse files Browse the repository at this point in the history 
Adapted from https://gitlab.gnome.org/GNOME/metacity/commit/c19aaa99
  • Loading branch information
@vkareh
vkareh committed Aug 28, 2018
1 parent d06b592 commit 2bea67f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Makefile.am
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ libmarco_private_la_SOURCES = \
libmarco_private_la_LDFLAGS = -no-undefined -version-info 1:0:0 libmarco_private_la_LDFLAGS = -no-undefined -version-info 1:0:0
libmarco_private_la_LIBADD = @MARCO_LIBS@ libmarco_private_la_LIBADD = @MARCO_LIBS@


libmarcoincludedir = $(includedir)/marco-1/marco-private libmarcoincludedir = $(includedir)/marco/marco-private


libmarcoinclude_HEADERS = \ libmarcoinclude_HEADERS = \
include/boxes.h \ include/boxes.h \
Expand Down
2 changes: 1 addition & 1 deletion src/libmarco-private.pc.in
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Description: Marco internals shared
Requires: gtk+-3.0 Requires: gtk+-3.0
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lmarco-private Libs: -L${libdir} -lmarco-private
Cflags: -I${includedir}/marco-1 Cflags: -I${includedir}/marco

2 comments on commit 2bea67f

@raveit65
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vkareh
Huston, we got a problem.
m-c-c doesn't build any more!

theme-thumbnail.c:4:10: fatal error: marco-private/util.h: No such file or directory
 #include <marco-private/util.h>
          ^~~~~~~~~~~~~~~~~~~~~~

@vkareh
Copy link
Member Author

@vkareh vkareh commented on 2bea67f Aug 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@raveit65 - crap, you're right. I've created a new pull request (#424) to revert it. It also adds more mate-theme-3 features.

Please sign in to comment.