Skip to content

Commit

Permalink
update autotools scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
Cactus64k committed Apr 21, 2015
1 parent e3abe53 commit 524b3cc
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 276 deletions.
20 changes: 10 additions & 10 deletions configure
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for simple-fb2-reader 1.0.6.
# Generated by GNU Autoconf 2.69 for simple-fb2-reader 1.0.7.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='simple-fb2-reader'
PACKAGE_TARNAME='simple-fb2-reader'
PACKAGE_VERSION='1.0.6'
PACKAGE_STRING='simple-fb2-reader 1.0.6'
PACKAGE_VERSION='1.0.7'
PACKAGE_STRING='simple-fb2-reader 1.0.7'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL='https://github.com/Cactus64k/simple-fb2-reader'

Expand Down Expand Up @@ -1246,7 +1246,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures simple-fb2-reader 1.0.6 to adapt to many kinds of systems.
\`configure' configures simple-fb2-reader 1.0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1308,7 +1308,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of simple-fb2-reader 1.0.6:";;
short | recursive ) echo "Configuration of simple-fb2-reader 1.0.7:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1402,7 +1402,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
simple-fb2-reader configure 1.0.6
simple-fb2-reader configure 1.0.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1825,7 +1825,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by simple-fb2-reader $as_me 1.0.6, which was
It was created by simple-fb2-reader $as_me 1.0.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -4152,7 +4152,7 @@ done
cat >>confdefs.h <<_ACEOF
#define GUI_CONSTRUCT_PATH "${prefix}/share/${PACKAGE_NAME}/${PACKAGE_NAME}.glade"
#define GUI_CONSTRUCT_PATH "${datarootdir}/${PACKAGE_NAME}/${PACKAGE_NAME}.glade"
_ACEOF
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -4673,7 +4673,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by simple-fb2-reader $as_me 1.0.6, which was
This file was extended by simple-fb2-reader $as_me 1.0.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -4736,7 +4736,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
simple-fb2-reader config.status 1.0.6
simple-fb2-reader config.status 1.0.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ([2.69])
AC_INIT([simple-fb2-reader], [1.0.6], [[email protected]], [], [https://github.com/Cactus64k/simple-fb2-reader])
AC_INIT([simple-fb2-reader], [1.0.7], [[email protected]], [], [https://github.com/Cactus64k/simple-fb2-reader])
# AM_INIT_AUTOMAKE
# AC_CONFIG_SRCDIR([src/])
AC_CONFIG_HEADERS([src/config.h])
Expand All @@ -28,7 +28,7 @@ AC_TYPE_SSIZE_T
AC_FUNC_REALLOC
AC_CHECK_FUNCS([memset setlocale strchr strerror])

AC_DEFINE_UNQUOTED([GUI_CONSTRUCT_PATH], "${prefix}/share/${PACKAGE_NAME}/${PACKAGE_NAME}.glade")
AC_DEFINE_UNQUOTED([GUI_CONSTRUCT_PATH], "${datarootdir}/${PACKAGE_NAME}/${PACKAGE_NAME}.glade")
AC_DEFINE_UNQUOTED([ENCODE_LIST_PATH], "${sysconfdir}/simple-fb2-reader_encoding_list.cfg")
AC_DEFINE_UNQUOTED([PACKAGE_VERSION], "${PACKAGE_VERSION}")

Expand Down
30 changes: 16 additions & 14 deletions makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ exec_prefix = @exec_prefix@
bindir = @bindir@
exec_prefix = @exec_prefix@
sysconfdir = @sysconfdir@
datarootdir = @datarootdir@
localedir = @localedir@

CC = @CC@
CFLAGS = @CFLAGS@
Expand Down Expand Up @@ -45,25 +47,25 @@ clean:
# FIXME for new project
mk_folders:
mkdir -p $(DESTDIR)$(prefix)/bin/
mkdir -p $(DESTDIR)$(prefix)/share/locale/en_US/LC_MESSAGES/
mkdir -p $(DESTDIR)$(prefix)/share/locale/ru/LC_MESSAGES/
mkdir -p $(DESTDIR)$(prefix)/share/applications/
mkdir -p $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/
mkdir -p $(DESTDIR)$(prefix)/share/mime/packages/
mkdir -p $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/mimetypes/
mkdir -p $(DESTDIR)$(localedir)/en_US/LC_MESSAGES/
mkdir -p $(DESTDIR)$(localedir)/ru/LC_MESSAGES/
mkdir -p $(DESTDIR)$(datarootdir)/applications/
mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/
mkdir -p $(DESTDIR)$(datarootdir)/mime/packages/
mkdir -p $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/mimetypes/
mkdir -p $(DESTDIR)$(sysconfdir)/
mkdir -p $(DESTDIR)$(prefix)/share/$(PROGNAME)/
mkdir -p $(DESTDIR)$(datarootdir)/$(PROGNAME)/

# FIXME for new project
install:mk_folders
install $(PROGNAME) $(DESTDIR)$(exec_prefix)/bin/$(PROGNAME)
cp intl/ru.mo $(DESTDIR)$(prefix)/share/locale/ru/LC_MESSAGES/$(PROGNAME).mo
cp intl/en_US.mo $(DESTDIR)$(prefix)/share/locale/en_US/LC_MESSAGES/$(PROGNAME).mo
cp res/$(PROGNAME).desktop $(DESTDIR)$(prefix)/share/applications/$(PROGNAME).desktop
cp res/$(PROGNAME).svg $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/apps/$(PROGNAME).svg
cp res/simple-fb2-reader.xml $(DESTDIR)$(prefix)/share/mime/packages/simple-fb2-reader.xml
cp res/application-x-fictionbook+xml.svg $(DESTDIR)$(prefix)/share/icons/hicolor/scalable/mimetypes/application-x-fictionbook+xml.svg
cp intl/ru.mo $(DESTDIR)$(localedir)/ru/LC_MESSAGES/$(PROGNAME).mo
cp intl/en_US.mo $(DESTDIR)$(localedir)/en_US/LC_MESSAGES/$(PROGNAME).mo
cp res/$(PROGNAME).desktop $(DESTDIR)$(datarootdir)/applications/$(PROGNAME).desktop
cp res/$(PROGNAME).svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/apps/$(PROGNAME).svg
cp res/simple-fb2-reader.xml $(DESTDIR)$(datarootdir)/mime/packages/simple-fb2-reader.xml
cp res/application-x-fictionbook+xml.svg $(DESTDIR)$(datarootdir)/icons/hicolor/scalable/mimetypes/application-x-fictionbook+xml.svg
cp res/simple-fb2-reader_encoding_list.cfg $(DESTDIR)$(sysconfdir)/simple-fb2-reader_encoding_list.cfg
cp res/$(PROGNAME).glade $(DESTDIR)$(prefix)/share/$(PROGNAME)/$(PROGNAME).glade
cp res/$(PROGNAME).glade $(DESTDIR)$(datarootdir)/$(PROGNAME)/$(PROGNAME).glade


8 changes: 4 additions & 4 deletions src/config.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* src/config.h. Generated from config.h.in by configure. */
#define GUI_CONSTRUCT_PATH "/usr/share/simple-fb2-reader/simple-fb2-reader.glade"
#define ENCODE_LIST_PATH "/etc/simple-fb2-reader_encoding_list.cfg"
#define PACKAGE_VERSION "1.0.4"
#define PACKAGE_NAME "simple-fb2-reader"
#define GUI_CONSTRUCT_PATH "NONE/share/simple-fb2-reader/simple-fb2-reader.glade"
#define ENCODE_LIST_PATH "${prefix}/etc/simple-fb2-reader_encoding_list.cfg"
#define PACKAGE_VERSION "1.0.6"
#define PACKAGE_NAME "simple-fb2-reader"
Loading

0 comments on commit 524b3cc

Please sign in to comment.