Mercurial > pidgin-twitter
changeset 58:31374ae054b0
branch merge
| author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
|---|---|
| date | Sat, 17 May 2008 21:05:12 +0900 |
| parents | 8e1c8afac4dd (diff) 34a9fb4b4701 (current diff) |
| children | 3f9148c1dc60 |
| files | |
| diffstat | 2 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Fri May 16 23:26:41 2008 +0900 +++ b/Makefile.in Sat May 17 21:05:12 2008 +0900 @@ -8,10 +8,10 @@ GLIB_LIBS = @GLIB_LIBS@ LDFLAGS = $(GLIB_LIBS) -PIDGIN_LIB_DIR = @PIDGIN_LIB_DIR@ +PIDGIN_PLUGIN_DIR = @PIDGIN_PREFIX@/lib/pidgin -default: $(OBJECTIVE) +all: $(OBJECTIVE) $(OBJECTIVE): $(SRC) @@ -19,14 +19,18 @@ install: $(OBJECTIVE) - install -m 755 $(OBJECTIVE) $(PIDGIN_LIB_DIR)/pidgin + install -m 755 $(OBJECTIVE) $(PIDGIN_PLUGIN_DIR) clean: rm -f $(OBJECTIVE) -distclean: clean +mostlyclean: clean rm -f Makefile config.log config.status aclocal.m4 *~ rm -rf autom4te.cache + +maintainer-clean: mostlyclean + rm -f .hgtags + rm -rf .hg
--- a/configure.in Fri May 16 23:26:41 2008 +0900 +++ b/configure.in Sat May 17 21:05:12 2008 +0900 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(pidgin-twitter, 0.1.0, yaz@honeyplanet.jp) +AC_INIT(pidgin-twitter, 0.6.0, yaz@honeyplanet.jp) AC_CONFIG_SRCDIR([pidgin-twitter.c]) # Checks for programs. @@ -31,10 +31,14 @@ ])]) PIDGIN_CFLAGS=`pkg-config --cflags pidgin 2> /dev/null` PIDGIN_LIBS=`pkg-config --libs pidgin 2> /dev/null` -PIDGIN_LIB_DIR=`pkg-config --variable=libdir pidgin 2> /dev/null` +if test x"$prefix" = x"NONE" ; then + PIDGIN_PREFIX=`pkg-config --variable=prefix pidgin 2> /dev/null` +else + PIDGIN_PREFIX=$prefix +fi AC_SUBST(PIDGIN_CFLAGS) AC_SUBST(PIDGIN_LIBS) -AC_SUBST(PIDGIN_LIB_DIR) +AC_SUBST(PIDGIN_PREFIX) # Checks for header files. AC_HEADER_STDC