Skip to content

Commit

Permalink
makefile: don't gzip the man pages
Browse files Browse the repository at this point in the history
Drop the gzip step from the manpages - distributions already do that as
needed. In addition this resolves the final reproducibility issue with
ibus.

BUG=#2514
  • Loading branch information
evelikov authored and fujiwarat committed Jun 11, 2023
1 parent 35d7438 commit 1a25975
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 25 deletions.
6 changes: 1 addition & 5 deletions bus/Makefile.am
Expand Up @@ -169,7 +169,6 @@ EXTRA_DIST = \

CLEANFILES = \
$(man_one_DATA) \
$(man_one_files) \
$(NULL)

$(libibus):
Expand All @@ -181,14 +180,11 @@ test: ibus-daemon
$(builddir)/ibus-daemon -v

man_one_in_files = ibus-daemon.1.in
man_one_files = $(man_one_in_files:.1.in=.1)
man_one_DATA =$(man_one_files:.1=.1.gz)
man_one_DATA = $(man_one_in_files:.1.in=.1)
man_onedir = $(mandir)/man1
%.1: %.1.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@
%.1.gz: %.1
$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@

-include $(top_srcdir)/git.mk
6 changes: 1 addition & 5 deletions data/dconf/Makefile.am
Expand Up @@ -38,15 +38,12 @@ dconfdb_DATA = 00-upstream-settings
{ rc=$$?; $(RM) -rf $@; exit $$rc; }

man_5_in_files = 00-upstream-settings.5.in ibus.5.in
man_5_files = $(man_5_in_files:.5.in=.5)
man_5_DATA =$(man_5_files:.5=.5.gz)
man_5_DATA = $(man_5_in_files:.5.in=.5)
man_5dir = $(mandir)/man5
%.5: %.5.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@
%.5.gz: %.5
$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@

install-data-hook:
if test -z "$(DESTDIR)"; then \
Expand All @@ -63,7 +60,6 @@ EXTRA_DIST = \

CLEANFILES = \
$(man_5_DATA) \
$(man_5_files) \
$(NULL)

MAINTAINERCLEANFILES = \
Expand Down
6 changes: 1 addition & 5 deletions setup/Makefile.am
Expand Up @@ -56,20 +56,16 @@ org.freedesktop.IBus.Setup.desktop: ibus-setup.desktop
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@

man_one_in_files = ibus-setup.1.in
man_one_files = $(man_one_in_files:.1.in=.1)
man_one_DATA =$(man_one_files:.1=.1.gz)
man_one_DATA = $(man_one_in_files:.1.in=.1)
man_onedir = $(mandir)/man1
%.1: %.1.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@
%.1.gz: %.1
$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@

CLEANFILES = \
$(desktop_DATA) \
$(man_one_DATA) \
$(man_one_files) \
*.pyc \
ibus-setup \
$(NULL)
Expand Down
6 changes: 1 addition & 5 deletions tools/Makefile.am
Expand Up @@ -113,15 +113,12 @@ libibusimmodule_la_LDFLAGS = \
$(NULL)

man_one_in_files = ibus.1.in
man_one_files = $(man_one_in_files:.1.in=.1)
man_one_DATA =$(man_one_files:.1=.1.gz)
man_one_DATA = $(man_one_in_files:.1.in=.1)
man_onedir = $(mandir)/man1
%.1: %.1.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@
%.1.gz: %.1
$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@

EXTRA_DIST = \
$(ibus_immodule_vapi) \
Expand All @@ -133,7 +130,6 @@ EXTRA_DIST = \

CLEANFILES = \
$(man_one_DATA) \
$(man_one_files) \
$(NULL)

if ENABLE_EMOJI_DICT
Expand Down
6 changes: 1 addition & 5 deletions ui/gtk3/Makefile.am
Expand Up @@ -257,15 +257,12 @@ panelbinding.o: $(srcdir)/panelbinding.c

MAINTAINERCLEANFILES += extension.c panelbinding.c

man_seven_files = $(man_seven_in_files:.7.in=.7)
man_seven_DATA =$(man_seven_files:.7=.7.gz)
man_seven_DATA = $(man_seven_in_files:.7.in=.7)
man_sevendir = $(mandir)/man7
%.7: %.7.in
$(AM_V_GEN) sed \
-e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \
mv $@.tmp $@
%.7.gz: %.7
$(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@

desktop_in_files = \
ibus-ui-emojier.desktop.in \
Expand Down Expand Up @@ -293,7 +290,6 @@ CLEANFILES += \
$(desktop_DATA) \
$(desktop_notrans_files) \
$(man_seven_DATA) \
$(man_seven_files) \
$(NULL)

endif
Expand Down

0 comments on commit 1a25975

Please sign in to comment.