Skip to content

fix for not finding libjalali.so.0: added ldconfig to Makefile.am to update the cache after installation is done. #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ libc implementations. Jalali calendar provides an API similar to that of libc's

Jalali calendar package consists of a library namely libjalali and two simple and easy to use terminal tools, jcal
and jdate with functionality similar to UNIX cal and date.


---

This library was written and maintained by Ashkan Ghasemi, he passed away in an [accident](https://jadi.net/2017/10/ashkan-ghasemi/).
Therefore there is no way to migrate the original repository to another person, so this fork is for keep the project alive.
4 changes: 4 additions & 0 deletions sources/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libjalali src man test_kit

install-exec-hook::
@echo "make[$(MAKELEVEL)]: Running ldconfig"
@sudo ldconfig

if WANT_PYJALALI
install-exec-hook:
@echo -e "\n###########################\n"\
Expand Down
3 changes: 3 additions & 0 deletions sources/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,7 @@ if test $installpyjalali = "yes"; then
fi
AM_CONDITIONAL([WANT_PYJALALI], [test $installpyjalali = "yes"])

AC_PATH_PROG(RM, rm, $FALSE)
RM="$RM -f"

AC_OUTPUT
14 changes: 11 additions & 3 deletions sources/src/jcal.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,11 @@ void show_cal(struct cal_layout* l,
printf(" ");
}

printf("%s%s%s", TERM_WHITE, cal_t[i], TERM_RESET);
if (l->color) {
printf("%s%s%s", TERM_WHITE, cal_t[i], TERM_RESET);
} else {
printf("%s", cal_t[i]);
}

for (k=0;
k<(cal_width - cal_tw[i] -
Expand All @@ -372,13 +376,17 @@ void show_cal(struct cal_layout* l,

for (i=0; i<m->n; i++) {
for (k=0; k<6; k++) {
printf("%s%s%s ", TERM_WHITE, ptr_d[k], TERM_RESET);
if (l->color) {
printf("%s%s%s ", TERM_WHITE, ptr_d[k], TERM_RESET);
} else {
printf("%s ", ptr_d[k]);
}
}

if (l->color)
printf("%s%s%s", TERM_RED, ptr_d[6], TERM_RESET);
else
printf("%s%s%s", TERM_WHITE, ptr_d[6], TERM_RESET);
printf("%s", ptr_d[6]);

if (i != m->n-1) {
for (k=0; k<l->margin; k++) {
Expand Down