Skip to content

Commit

Permalink
Fix some build errors with make dist
Browse files Browse the repository at this point in the history
The latest distcheck requires uninstall-hook for install-data-hook
and missed wayland_scanner_rules with --disable-wayland.
  • Loading branch information
fujiwarat committed Aug 23, 2019
1 parent b07b6b7 commit 7fc8943
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
22 changes: 21 additions & 1 deletion bindings/pygobject/Makefile.am
Expand Up @@ -4,7 +4,7 @@
#
# Copyright (c) 2012 Daiki Ueno <ueno@unixuser.org>
# Copyright (c) 2014-2016 Peng Huang <shawn.p.huang@gmail.com>
# Copyright (c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
# Copyright (c) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>
# Copyright (c) 2012-2018 Red Hat, Inc.
#
# This library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -60,6 +60,7 @@ EXTRA_DIST = \
$(NULL)

install-data-hook:
@$(NORMAL_INSTALL)
if ENABLE_PYTHON2
@for data in $(overrides2_DATA); do \
file=`echo $$data | sed -e 's|^.*/||'`; \
Expand All @@ -70,5 +71,24 @@ if ENABLE_PYTHON2
$$dlist
endif
$(NULL)
uninstall-hook:
@$(NORMAL_UNINSTALL)
if ENABLE_PYTHON2
@list='$(overrides2_DATA)'; test -n "$(overrides2dir)" || list=; \
py_files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$py_files" || exit 0; \
dir='$(DESTDIR)$(overrides2dir)'; \
pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \
pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \
for files in \
"$$py_files" \
"$$pyc_files" \
"$$pyo_files" \
; do \
test -z "$$files" || rm -f "$$dir/$$files" || st=$$?; \
done; \
exit $$st
endif
$(NULL)

-include $(top_srcdir)/git.mk
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -296,6 +296,7 @@ if test x"$enable_wayland" = x"yes"; then
[AC_SUBST(wayland_scanner_rules)])
else
enable_wayland="no (disabled, use --enable-wayland to enable)"
AC_SUBST(wayland_scanner_rules)
fi

enable_appindicator_engine_icon="no"
Expand Down
4 changes: 4 additions & 0 deletions data/its/Makefile.am
Expand Up @@ -26,4 +26,8 @@ its_DATA = \
ibus.loc \
$(NULL)

EXTRA_DIST = \
$(its_DATA) \
$(NULL)

-include $(top_srcdir)/git.mk

0 comments on commit 7fc8943

Please sign in to comment.