Fix makefile

update data
xtotdam · Nov 1, 2016 · 7ecf79e · 7ecf79e
1 parent aa34952
commit 7ecf79e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -6,13 +6,19 @@ RM          = rm -rfv
 ALL_SUFFS   = pdf aux log out
 TMP_SUFFS   = aux log out
 
+
+ifeq ($(OS),Windows_NT)
+	PYTHON3 = C:\Miniconda3\python.exe
+else
+	PYTHON3 = python3
+endif
+
 .PHONY: all clean purge color wb example
 
 all: color wb
 
 data.tex: data.py
-	C:\Miniconda3\python.exe data.py
-	#python3 data.py
+	${PYTHON3} data.py
 
 timetable.pdf: data.tex timetable.tex defines.tex colors.tex
 	${LATEX} timetable

diff --git a/data.py b/data.py
@@ -12,10 +12,12 @@
 '''
 
 monday = [
-"\\blue \\ppp{Научно-иссл. семинар}{4-28}{Салецкий А.М.}",
+#"\\blue \\ppp{Научно-иссл. семинар}{4-28}{Салецкий А.М.}",
+"\\blue \\ppp{``Мягкая'' материя $+$ НИС}{4-28}{Салецкий А.М.}",
 "\\green \\ppp{Преподавание физ.-мат. дисциплин}{ЮФА}{Якута А.А.}",
 "\\green \\ppp{Современные проблемы физики}{ЦФА}{~}",
-"\\blue \\ppp{``Мягкая'' материя}{4-28}{Салецкий А.М.}",
+#"\\blue \\ppp{``Мягкая'' материя}{4-28}{Салецкий А.М.}",
+"",
 ""
 ]
 tuesday = ["", "", "", "", ""]